From dd02d08c219150f36f7d9235e3e0da8ff76bad78 Mon Sep 17 00:00:00 2001 From: Robert Byrne Date: Wed, 18 Mar 2015 13:28:49 +0000 Subject: [PATCH] add bar and radar chart options --- Gruntfile.js | 1 + addon/data/html/view.html | 171 +++++++++++++++++++--------------- addon/data/js/controller.js | 41 ++++++-- addon/lib/Panel.js | 7 +- addon/locale/bg.properties | 5 + addon/locale/cs-CZ.properties | 5 + addon/locale/de-DE.properties | 5 + addon/locale/en-GB.properties | 7 +- addon/locale/en-US.properties | 5 + addon/locale/es-ES.properties | 5 + addon/locale/fr-FR.properties | 5 + addon/locale/it-IT.properties | 5 + addon/locale/ja-JP.properties | 5 + addon/locale/ko-KR.properties | 5 + addon/locale/pl.properties | 5 + addon/locale/pt-PT.properties | 5 + addon/locale/ru-RU.properties | 5 + addon/locale/sv-SE.properties | 5 + addon/locale/uk-UA.properties | 5 + addon/locale/zh-CN.properties | 5 + addon/package.json | 156 +++++++++++++++---------------- bower.json | 38 ++++---- package.json | 54 +++++------ 23 files changed, 339 insertions(+), 211 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index cd87762..a2d4619 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -48,6 +48,7 @@ module.exports = function (grunt) { options: { stoponerror: false, reset: true, + relaxerror: ['Empty heading.'] // localization id placed as attribute to heading }, files: { src: ['addon/data/html/*.html'] diff --git a/addon/data/html/view.html b/addon/data/html/view.html index e49d6d0..840d05b 100644 --- a/addon/data/html/view.html +++ b/addon/data/html/view.html @@ -68,82 +68,101 @@
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - -
- - - -
- - - -
- - - -
- - - -
- - - - -
- - - -
- - - -
-
+

+ + + + + + + + + +
+ + + +
+ + + +
+ +

+ + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ + + +
+ +

+ + + + + +
+ + + + +
diff --git a/addon/data/js/controller.js b/addon/data/js/controller.js index e8248c2..19abb28 100644 --- a/addon/data/js/controller.js +++ b/addon/data/js/controller.js @@ -88,6 +88,11 @@ document.getElementById('panelHeight').onkeyup = function (event) { } }; +document.getElementById('graphType').addEventListener("change", function (event) { + + self.port.emit("graphTypeSetting", document.getElementById('graphType').value); +}, false); + /* @@ -106,6 +111,7 @@ self.port.on("stats", function (stats) { document.getElementById("memoryUrlInUsage").checked = parsedStats.memoryUrlInUsage; document.getElementById("panelWidth").value = parsedStats.panelWidth; document.getElementById("panelHeight").value = parsedStats.panelHeight; + document.getElementById("graphType").value = parsedStats.graphType; document.getElementById("canvas").width = parsedStats.panelWidth - 45; document.getElementById("canvas").height = parsedStats.panelHeight - 185; @@ -197,24 +203,41 @@ function syntaxHighlight(json) { } function updateCanvas(graphData) { - myNewChart = new Chart(document.getElementById("canvas").getContext("2d")).Line( - graphData, { - animation: false, - showTooltips: false, - responsive: false, - pointDot: false - }); + var options = { + animation: false, + showTooltips: false, + responsive: false, + pointDot: false + }; + + // determine graph type + if (parseInt(document.getElementById("graphType").value) === 0) { + + myNewChart = new Chart(document.getElementById("canvas").getContext("2d")).Line(graphData, options); + + } else if (parseInt(document.getElementById("graphType").value) === 1) { + + myNewChart = new Chart(document.getElementById("canvas").getContext("2d")).Bar(graphData, options); + + } else if (parseInt(document.getElementById("graphType").value) === 2) { + + myNewChart = new Chart(document.getElementById("canvas").getContext("2d")).Radar(graphData, options); + } + + // clear previous legend document.getElementById('legend').textContent = ''; + // create legend var ul = document.createElement('ul'); for (var i = 0; i < graphData.datasets.length; i++) { - var li = document.createElement('li'); + var li = document.createElement('li'), + label = document.createElement('label'); + ul.appendChild(li); - var label = document.createElement('label'); label.appendChild(document.createTextNode(graphData.datasets[i].data[4] + ': ' + graphData.datasets[i].label)); label.className = 'boldText'; label.style.color = graphData.datasets[i].strokeColor; diff --git a/addon/lib/Panel.js b/addon/lib/Panel.js index 50cbe40..351daa9 100644 --- a/addon/lib/Panel.js +++ b/addon/lib/Panel.js @@ -25,7 +25,8 @@ exports.init = function () { memoryUsageOnTabTitles: Preference.get("memoryUsageOnTabTitles"), memoryUrlInUsage: Preference.get("memoryUrlInUsage"), panelWidth: Preference.get("panelWidth"), - panelHeight: Preference.get("panelHeight") + panelHeight: Preference.get("panelHeight"), + graphType: Preference.get("graphType") }); panel.port.emit("stats", stats); @@ -85,6 +86,10 @@ exports.init = function () { parseInt(Preference.get("panelWidth")), parseInt(Preference.get("panelHeight"))); }); + + panel.port.on("graphTypeSetting", function (value) { + Preference.set('graphType', parseInt(value)); + }); }; exports.get = function () { diff --git a/addon/locale/bg.properties b/addon/locale/bg.properties index c8015c1..8d54d3f 100644 --- a/addon/locale/bg.properties +++ b/addon/locale/bg.properties @@ -9,6 +9,11 @@ openNow_title=Open сега: openSession_title=отварят по време на сесията: openInstall_title=затворено от адон инсталирате: +behaviour_title=Поведение +ui_title=User Interface +tasks_title=Задачи +graphType_title=Graph Type + memoryInterval_title=колко секунди между събирането на данни с памет? memoryTracking_title=Включи памет проследяването на използването? memoryUsageOnTabTitlesPref_title=Show използването на паметта в раздела заглавия? diff --git a/addon/locale/cs-CZ.properties b/addon/locale/cs-CZ.properties index 42b9ab6..faead5e 100644 --- a/addon/locale/cs-CZ.properties +++ b/addon/locale/cs-CZ.properties @@ -9,6 +9,11 @@ openNow_title=Otevřeno teď: openSession_title=Otevřeno během zasedání: openInstall_title=Otevřeno od addon instalace: +behaviour_title=Chování +ui_title=User Interface +tasks_title=Úkoly +graphType_title=Graph Type + memoryInterval_title=Kolik sekund mezi sběru dat z paměti? memoryTracking_title=Povolit sledování využití paměti? Využití memoryUsageOnTabTitlesPref_title=Show paměti kartě tituly? diff --git a/addon/locale/de-DE.properties b/addon/locale/de-DE.properties index d8dd1f7..9aa50cd 100644 --- a/addon/locale/de-DE.properties +++ b/addon/locale/de-DE.properties @@ -9,6 +9,11 @@ openNow_title=Offen jetzt: openSession_title=während der Sitzung geöffnet: openInstall_title=seit Addon eröffnete installieren: +behaviour_title=Behaviour +ui_title=User Interface +tasks_title=Aufgaben +graphType_title=Diagrammtyp + memoryInterval_title=Wie viele Sekunden zwischen den Speicherdatenerfassung? memoryTracking_title=Freigabe Speichernutzung Tracking? Speichernutzung memoryUsageOnTabTitlesPref_title=Anzeigen in Tab-Reiter? diff --git a/addon/locale/en-GB.properties b/addon/locale/en-GB.properties index 0d6f18f..b493bd4 100644 --- a/addon/locale/en-GB.properties +++ b/addon/locale/en-GB.properties @@ -9,6 +9,11 @@ openNow_title=Open now: openSession_title=Opened during session: openInstall_title=Opened since addon install: +behaviour_title=Behaviour +ui_title=User Interface +tasks_title=Tasks +graphType_title=Graph Type + memoryInterval_title=How many seconds between memory data collection? memoryTracking_title=Enable memory usage tracking? memoryUsageOnTabTitlesPref_title=Show memory usage in tab titles? @@ -25,4 +30,4 @@ garbageCollection_title=Perform a garbage collection run_title=Run panelWidth_title=Width of Panel UI -panelHeight_title=Height of Panel UI \ No newline at end of file +panelHeight_title=Height of Panel UI diff --git a/addon/locale/en-US.properties b/addon/locale/en-US.properties index b6abaf3..b493bd4 100644 --- a/addon/locale/en-US.properties +++ b/addon/locale/en-US.properties @@ -9,6 +9,11 @@ openNow_title=Open now: openSession_title=Opened during session: openInstall_title=Opened since addon install: +behaviour_title=Behaviour +ui_title=User Interface +tasks_title=Tasks +graphType_title=Graph Type + memoryInterval_title=How many seconds between memory data collection? memoryTracking_title=Enable memory usage tracking? memoryUsageOnTabTitlesPref_title=Show memory usage in tab titles? diff --git a/addon/locale/es-ES.properties b/addon/locale/es-ES.properties index b2b0535..de7465d 100644 --- a/addon/locale/es-ES.properties +++ b/addon/locale/es-ES.properties @@ -9,6 +9,11 @@ openNow_title=Abrir ahora: openSession_title=inaugurado durante la sesión: openInstall_title=Abierto desde addon instalar: +behaviour_title=Comportamiento +ui_title=Interfaz de usuario +tasks_title=Tareas +graphType_title=Gráfico Tipo + memoryInterval_title=¿Cuántos segundos entre la recopilación de datos de la memoria? memoryTracking_title=Habilitar el seguimiento de uso de la memoria? memoryUsageOnTabTitlesPref_title=Mostrar uso de memoria en títulos de las fichas? diff --git a/addon/locale/fr-FR.properties b/addon/locale/fr-FR.properties index b66a5c3..a6b2cf6 100644 --- a/addon/locale/fr-FR.properties +++ b/addon/locale/fr-FR.properties @@ -9,6 +9,11 @@ openNow_title=Ouvrir maintenant: openSession_title=Ouvert pendant la session: openInstall_title=Ouvert depuis addon installer: +behaviour_title=Comportement +ui_title=Interface utilisateur +tasks_title=Tâches +graphType_title=Type de Graphique + memoryInterval_title=Combien de secondes entre la collecte des données de la mémoire? memoryTracking_title=Activer la mémoire suivi de l'utilisation? memoryUsageOnTabTitlesPref_title=Montrer utilisation de la mémoire dans les titres de l'onglet? diff --git a/addon/locale/it-IT.properties b/addon/locale/it-IT.properties index 1541528..9c968e1 100644 --- a/addon/locale/it-IT.properties +++ b/addon/locale/it-IT.properties @@ -9,6 +9,11 @@ openNow_title=Aperto ora: openSession_title=Aperto durante la sessione: openInstall_title=Aperto dal addon installazione: +behaviour_title=Comportamento +ui_title=Interfaccia utente +tasks_title=Compiti +graphType_title=Graph Tipo + memoryInterval_title=Quanti secondi tra la raccolta dei dati di memoria? memoryTracking_title=Abilita monitoraggio dell'utilizzo della memoria? memoryUsageOnTabTitlesPref_title=Mostra l'utilizzo della memoria in titolo della scheda? diff --git a/addon/locale/ja-JP.properties b/addon/locale/ja-JP.properties index 67ef1e6..cbe10a4 100644 --- a/addon/locale/ja-JP.properties +++ b/addon/locale/ja-JP.properties @@ -9,6 +9,11 @@ openNow_title=オープン： openSession_title=セッション中に開かれた。 openInstall_title=アドオンから開かインストールします。 +behaviour_title=行動 +ui_title=ユーザーインターフェース +tasks_title=タスク +graphType_title=グラフの種類 + memoryInterval_title=は、メモリのデータ収集の間に何秒？ memoryTracking_title=メモリ使用量の追跡を有効にしますか？ memoryUsageOnTabTitlesPref_title=を表示するメモリ使用量？ diff --git a/addon/locale/ko-KR.properties b/addon/locale/ko-KR.properties index 74ec8a7..8244f1e 100644 --- a/addon/locale/ko-KR.properties +++ b/addon/locale/ko-KR.properties @@ -9,6 +9,11 @@ openNow_title=열기 : openSession_title=세션 동안 개설 : openInstall_title=애드온 이후 개설 설치 : +behaviour_title=행동 +ui_title=사용자 인터페이스 +tasks_title=작업 +graphType_title=그래프 유형 + memoryInterval_title=메모리 데이터 수집 사이에 몇 초 ? memoryTracking_title=메모리 사용 추적을 사용 하시겠습니까? memoryUsageOnTabTitlesPref_title=쇼 메모리 사용량? diff --git a/addon/locale/pl.properties b/addon/locale/pl.properties index 6af5455..cf5f0eb 100644 --- a/addon/locale/pl.properties +++ b/addon/locale/pl.properties @@ -9,6 +9,11 @@ openNow_title=Otwórz teraz: openSession_title=Otwarty w czasie sesji: openInstall_title=Otwarty od addon zainstalować: +behaviour_title=Zachowanie +ui_title=Interfejs użytkownika +tasks_title=Zadania +graphType_title=Rodzaj Wykres + memoryInterval_title=Ile sekund między zbierania danych pamięci? memoryTracking_title=Włącz pamięci śledzenia wykorzystania? memoryUsageOnTabTitlesPref_title=Pokaż wykorzystanie pamięci w tytułach karcie? diff --git a/addon/locale/pt-PT.properties b/addon/locale/pt-PT.properties index df03c04..ec44e4c 100644 --- a/addon/locale/pt-PT.properties +++ b/addon/locale/pt-PT.properties @@ -9,6 +9,11 @@ openNow_title=Abrir agora: openSession_title=Inaugurado durante a sessão: openInstall_title=Aberto desde addon instalar: +behaviour_title=Behaviour +ui_title=Interface de Usuário +tasks_title=Tarefas +graphType_title=Graph Tipo + memoryInterval_title=quantos segundos entre a coleta de dados de memória? memoryTracking_title=Ativar o acompanhamento de uso de memória? memoryUsageOnTabTitlesPref_title=Mostrar o uso de memória em títulos de guia? diff --git a/addon/locale/ru-RU.properties b/addon/locale/ru-RU.properties index 3c45934..7ddfb87 100644 --- a/addon/locale/ru-RU.properties +++ b/addon/locale/ru-RU.properties @@ -9,6 +9,11 @@ openNow_title=Открыть сейчас: openSession_title=Открыт во время сессии: openInstall_title=Открыта с аддоном установить: +behaviour_title=поведения +ui_title=Интерфейс пользователя +tasks_title=Задачи +graphType_title=График Тип + memoryInterval_title=Сколько секунд между сбором данных на карте памяти? memoryTracking_title=Включить отслеживание использования памяти? memoryUsageOnTabTitlesPref_title=Показать использование памяти в названиях вкладок? diff --git a/addon/locale/sv-SE.properties b/addon/locale/sv-SE.properties index 8fe1247..81f752a 100644 --- a/addon/locale/sv-SE.properties +++ b/addon/locale/sv-SE.properties @@ -9,6 +9,11 @@ openNow_title=Öppet nu: openSession_title=Öppnade under sessionen: openInstall_title=Öppnade sedan addon installera: +behaviour_title=Beteende +ui_title=Användargränssnitt +tasks_title=Uppgifter +graphType_title=Graph Type + memoryInterval_title=Hur många sekunder mellan insamling minnesdata? memoryTracking_title=Aktivera användningsspårning minne? memoryUsageOnTabTitlesPref_title=Visa minnesanvändning i fliken titlar? diff --git a/addon/locale/uk-UA.properties b/addon/locale/uk-UA.properties index ff14802..0b6b015 100644 --- a/addon/locale/uk-UA.properties +++ b/addon/locale/uk-UA.properties @@ -9,6 +9,11 @@ openNow_title=Відкрити зараз: openSession_title=Відкрито під час сесії: openInstall_title=Відкрита з аддоном встановити: +behaviour_title =поведінки +ui_title=Інтерфейс користувача +tasks_title=Завдання +graphType_title=Графік Тип + memoryInterval_title=Скільки секунд між збором даних на карті пам'яті? memoryTracking_title=Включити відстеження використання пам'яті? memoryUsageOnTabTitlesPref_title=Показати використання пам'яті в назвах вкладок? diff --git a/addon/locale/zh-CN.properties b/addon/locale/zh-CN.properties index e031bb6..06a1b08 100644 --- a/addon/locale/zh-CN.properties +++ b/addon/locale/zh-CN.properties @@ -9,6 +9,11 @@ openNow_title=打開現在： openSession_title=會話期間開業時間： openInstall_title=自開業插件安裝： +behaviour_title=行為 +ui_title=用戶界面 +tasks_title=任務 +graphType_title=圖表類型 + memoryInterval_title=內存中的數據收集之間有多少秒？ memoryTracking_title=啟用內存使用情況跟踪？ memoryUsageOnTabTitlesPref_title=顯示內存使用情況？ diff --git a/addon/package.json b/addon/package.json index 65b52a1..8d999bc 100644 --- a/addon/package.json +++ b/addon/package.json @@ -1,80 +1,80 @@ { - "name": "tab-data-addon", - "title": "Tab Data", - "id": "jid1-4ogjq7MUzAiCOw", - "description": "Provides user with tab related stats/data", - "author": "Robert Byrne", - "license": "GNU GPL v3", - "version": "0.4.3", - "permissions": { - "private-browsing": true - }, - "preferences": [ - { - "name": "memoryInterval", - "title": "How many seconds between memory data collection?", - "type": "string", - "value": "10" - }, - { - "name": "memoryTracking", - "title": "Enable memory usage tracking?", - "type": "bool", - "value": true - }, - { - "name": "memoryUsageOnTabTitles", - "title": "Show memory usage in tab titles?", - "type": "menulist", - "value": 0, - "options": [ - { - "value": "0", - "label": "Prepend" - }, - { - "value": "1", - "label": "Append" - }, - { - "value": "2", - "label": "Disable" - } - ] - }, - { - "name": "memoryFormat", - "title": "Format of memory usage on panel?", - "type": "menulist", - "value": 0, - "options": [ - { - "value": "0", - "label": "JSON" - }, - { - "value": "1", - "label": "Plain" - } - ] - }, - { - "name": "memoryUrlInUsage", - "title": "Show Url on memory usage panel?", - "type": "bool", - "value": true - }, - { - "name": "panelWidth", - "title": "Width of Panel UI", - "type": "string", - "value": "525" - }, - { - "name": "panelHeight", - "title": "Height of Panel UI", - "type": "string", - "value": "475" - } - ] + "name": "tab-data-addon", + "title": "Tab Data", + "id": "jid1-4ogjq7MUzAiCOw", + "description": "Provides user with tab related stats/data", + "author": "Robert Byrne", + "license": "GNU GPL v3", + "version": "0.4.3", + "permissions": { + "private-browsing": true + }, + "preferences": [{ + "name": "memoryInterval", + "title": "How many seconds between memory data collection?", + "type": "string", + "value": "10" + }, { + "name": "memoryTracking", + "title": "Enable memory usage tracking?", + "type": "bool", + "value": true + }, { + "name": "memoryUsageOnTabTitles", + "title": "Show memory usage in tab titles?", + "type": "menulist", + "value": 0, + "options": [{ + "value": "0", + "label": "Prepend" + }, { + "value": "1", + "label": "Append" + }, { + "value": "2", + "label": "Disable" + }] + }, { + "name": "memoryFormat", + "title": "Format of memory usage on panel?", + "type": "menulist", + "value": 0, + "options": [{ + "value": "0", + "label": "JSON" + }, { + "value": "1", + "label": "Plain" + }] + }, { + "name": "memoryUrlInUsage", + "title": "Show Url on memory usage panel?", + "type": "bool", + "value": true + }, { + "name": "panelWidth", + "title": "Width of Panel UI", + "type": "string", + "value": "525" + }, { + "name": "panelHeight", + "title": "Height of Panel UI", + "type": "string", + "value": "500" + }, { + "name": "graphType", + "title": "Graph type?", + "type": "menulist", + "value": 0, + "options": [{ + "value": "0", + "label": "Line" + }, { + "value": "1", + "label": "Bar" + }, { + "value": "2", + "label": "Radar" + }] + }] } diff --git a/bower.json b/bower.json index 3f6d3bc..8624709 100644 --- a/bower.json +++ b/bower.json @@ -1,21 +1,21 @@ { - "name": "tab-data-firefox", - "version": "0.4.3", - "homepage": "https://github.com/bobbyrne01/tab-data-firefox", - "authors": [ - "Robert Byrne" - ], - "description": "Firefox addon providing user with tab related stats/data", - "main": "addon/lib/main.js", - "keywords": [ - "firefox", - "tab", - "memory", - "count" - ], - "license": "GNU GPL v3", - "private": true, - "dependencies": { - "Chart.js": "~1.0.1" - } + "name": "tab-data-firefox", + "version": "0.4.3", + "homepage": "https://github.com/bobbyrne01/tab-data-firefox", + "authors": [ + "Robert Byrne" + ], + "description": "Firefox addon providing user with tab related stats/data", + "main": "addon/lib/main.js", + "keywords": [ + "firefox", + "tab", + "memory", + "count" + ], + "license": "GNU GPL v3", + "private": true, + "dependencies": { + "Chart.js": "~1.0.1" + } } diff --git a/package.json b/package.json index 860e69e..31b8e23 100644 --- a/package.json +++ b/package.json @@ -1,29 +1,29 @@ { - "name": "tab-data-firefox", - "version": "0.4.3", - "description": "Firefox addon providing user with tab related stats/data", - "main": "addon/lib/main.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "repository": { - "type": "git", - "url": "https://github.com/bobbyrne01/tab-data-firefox.git" - }, - "author": "Robert Byrne", - "license": "GNU GPL v3", - "bugs": { - "url": "https://github.com/bobbyrne01/tab-data-firefox/issues" - }, - "homepage": "https://github.com/bobbyrne01/tab-data-firefox", - "devDependencies": { - "grunt": "^0.4.5", - "grunt-contrib-csslint": "^0.4.0", - "grunt-contrib-jshint": "^0.11.0", - "grunt-contrib-watch": "^0.6.1", - "grunt-html-validation": "^0.1.18", - "grunt-jsbeautifier": "^0.2.7", - "grunt-notify": "^0.4.1", - "grunt-release": "^0.11.0" - } + "name": "tab-data-firefox", + "version": "0.4.3", + "description": "Firefox addon providing user with tab related stats/data", + "main": "addon/lib/main.js", + "scripts": { + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "https://github.com/bobbyrne01/tab-data-firefox.git" + }, + "author": "Robert Byrne", + "license": "GNU GPL v3", + "bugs": { + "url": "https://github.com/bobbyrne01/tab-data-firefox/issues" + }, + "homepage": "https://github.com/bobbyrne01/tab-data-firefox", + "devDependencies": { + "grunt": "^0.4.5", + "grunt-contrib-csslint": "^0.4.0", + "grunt-contrib-jshint": "^0.11.0", + "grunt-contrib-watch": "^0.6.1", + "grunt-html-validation": "^0.1.18", + "grunt-jsbeautifier": "^0.2.7", + "grunt-notify": "^0.4.1", + "grunt-release": "^0.11.0" + } }