Skip to content

Commit

Permalink
add bar and radar chart options
Browse files Browse the repository at this point in the history
  • Loading branch information
@bobbyrne01
bobbyrne01 committed Mar 18, 2015
1 parent c9a61c6 commit dd02d08
Show file tree
Hide file tree
Showing 23 changed files with 339 additions and 211 deletions.
1 change: 1 addition & 0 deletions Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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']
Expand Down
171 changes: 95 additions & 76 deletions addon/data/html/view.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -68,82 +68,101 @@
<label class="tabLabel" for="tab-4" data-l10n-id="settingsLabel"></label>
<div class="content">
<div id="settingsView">
<div id="settings">
<table>
<tr>
<td>
<label data-l10n-id="memoryTracking_title"></label>
</td>
<td>
<input id="memoryTrackingPref" type="checkbox" />
</td>
</tr>
<tr>
<td>
<label data-l10n-id="memoryInterval_title"></label>
</td>
<td>
<input id="memoryIntervalPref" type="number" />
</td>
</tr>
<tr>
<td>
<label data-l10n-id="memoryUsageOnTabTitlesPref_title"></label>
</td>
<td>
<select id="memoryUsageOnTabTitlesPref">
<option value="0">Prepend</option>
<option value="1">Append</option>
<option value="2">Disable</option>
</select>
</td>
</tr>
<tr>
<td>
<label data-l10n-id="memoryFormat_title"></label>
</td>
<td>
<select id="memoryFormat">
<option value="0">JSON</option>
<option value="1">Plain</option>
</select>
</td>
</tr>
<tr>
<td>
<label data-l10n-id="showUrl_title"></label>
</td>
<td>
<input id="memoryUrlInUsage" type="checkbox" />
</td>
</tr>
<tr>
<td>
<label data-l10n-id="garbageCollection_title"></label>
</td>
<td>
<button id="schedulePreciseGC" data-l10n-id="run_title"></button>
<label id="schedulePreciseGCStatus" style="display: none;">&#10004;</label>
</td>
</tr>
<tr>
<td>
<label data-l10n-id="panelWidth_title"></label>
</td>
<td>
<input id="panelWidth" type="number" />
</td>
</tr>
<tr>
<td>
<label data-l10n-id="panelHeight_title"></label>
</td>
<td>
<input id="panelHeight" type="number" />
</td>
</tr>
</table>
</div>
<h3 data-l10n-id="behaviour_title"></h3>
<table>
<tr>
<td>
<label data-l10n-id="memoryTracking_title"></label>
</td>
<td>
<input id="memoryTrackingPref" type="checkbox" />
</td>
</tr>
<tr>
<td>
<label data-l10n-id="memoryInterval_title"></label>
</td>
<td>
<input id="memoryIntervalPref" type="number" />
</td>
</tr>
</table>

<h3 data-l10n-id="ui_title"></h3>
<table>
<tr>
<td>
<label data-l10n-id="memoryUsageOnTabTitlesPref_title"></label>
</td>
<td>
<select id="memoryUsageOnTabTitlesPref">
<option value="0">Prepend</option>
<option value="1">Append</option>
<option value="2">Disable</option>
</select>
</td>
</tr>
<tr>
<td>
<label data-l10n-id="memoryFormat_title"></label>
</td>
<td>
<select id="memoryFormat">
<option value="0">JSON</option>
<option value="1">Plain</option>
</select>
</td>
</tr>
<tr>
<td>
<label data-l10n-id="showUrl_title"></label>
</td>
<td>
<input id="memoryUrlInUsage" type="checkbox" />
</td>
</tr>
<tr>
<td>
<label data-l10n-id="panelWidth_title"></label>
</td>
<td>
<input id="panelWidth" type="number" />
</td>
</tr>
<tr>
<td>
<label data-l10n-id="panelHeight_title"></label>
</td>
<td>
<input id="panelHeight" type="number" />
</td>
</tr>
<tr>
<td>
<label data-l10n-id="graphType_title"></label>
</td>
<td>
<select id="graphType">
<option value="0">Line</option>
<option value="1">Bar</option>
<option value="2">Radar</option>
</select>
</td>
</tr>
</table>

<h3 data-l10n-id="tasks_title"></h3>
<table>
<tr>
<td>
<label data-l10n-id="garbageCollection_title"></label>
</td>
<td>
<button id="schedulePreciseGC" data-l10n-id="run_title"></button>
<label id="schedulePreciseGCStatus" style="display: none;">&#10004;</label>
</td>
</tr>
</table>
</div>
</div>
</div>
Expand Down
41 changes: 32 additions & 9 deletions addon/data/js/controller.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);



/*
Expand All @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
7 changes: 6 additions & 1 deletion addon/lib/Panel.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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 () {
Expand Down
5 changes: 5 additions & 0 deletions addon/locale/bg.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 използването на паметта в раздела заглавия?
Expand Down
5 changes: 5 additions & 0 deletions addon/locale/cs-CZ.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
5 changes: 5 additions & 0 deletions addon/locale/de-DE.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
7 changes: 6 additions & 1 deletion addon/locale/en-GB.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand All @@ -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
panelHeight_title=Height of Panel UI
5 changes: 5 additions & 0 deletions addon/locale/en-US.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
5 changes: 5 additions & 0 deletions addon/locale/es-ES.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
5 changes: 5 additions & 0 deletions addon/locale/fr-FR.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
5 changes: 5 additions & 0 deletions addon/locale/it-IT.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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?
Expand Down
5 changes: 5 additions & 0 deletions addon/locale/ja-JP.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,11 @@ openNow_title=オープン：
openSession_title=セッション中に開かれた。
openInstall_title=アドオンから開かインストールします。

behaviour_title=行動
ui_title=ユーザーインターフェース
tasks_title=タスク
graphType_title=グラフの種類

memoryInterval_title=は、メモリのデータ収集の間に何秒？
memoryTracking_title=メモリ使用量の追跡を有効にしますか？
memoryUsageOnTabTitlesPref_title=を表示するメモリ使用量？
Expand Down
Loading

0 comments on commit dd02d08

Please sign in to comment.