wellton/openbci-dashboard
1
0
Fork 0
Código Issues Pull Requests Ações Pacotes Projetos Versões Wiki Atividade

wip: upgrade to chartjs 2

Ver Código-Fonte
Esse commit está contido em:
Alex Castillo
2016-05-03 02:44:20 -04:00
pai 544dec0433
commit 653b741e7e
4 arquivos alterados com 25 adições e 26 exclusões
Baixar Arquivo de Patch Baixar Arquivo de Diff Expandir todos os arquivos Colapsar todos os arquivos
app/components/frequency/frequency.js
+2 -2
Ver Arquivo
@@ -12,7 +12,7 @@
var $ctrl = this;
// Default chart type as fallback
$ctrl.type = $ctrl.type || 'Line';
$ctrl.type = $ctrl.type || 'line';
var socket = io();
@@ -29,7 +29,7 @@
$ctrl.options = {
responsive: true,
animation: true,
//animation: true,
animationSteps: 15
};
app/index.html
+3 -4
Ver Arquivo
@@ -3,7 +3,6 @@
<head>
<title>BCI Dashboard</title>
<link rel="stylesheet" href="node_modules/angular-chart.js/dist/angular-chart.css">
<link rel="stylesheet" href="visualizer.css">
<link rel="stylesheet" href="components/topo/topo.css">
@@ -11,7 +10,7 @@
<script src="node_modules/smoothie/smoothie.js"></script>
<script src="node_modules/angular/angular.js"></script>
<script src="node_modules/chart.js/Chart.js"></script>
<script src="node_modules/chart.js/dist/Chart.js"></script>
<script src="node_modules/angular-chart.js/dist/angular-chart.js"></script>
<script src="visualizer.js"></script>
@@ -46,11 +45,11 @@
</section>
<section class="row" ng-if="mode == 'frequency'">
<bci-frequency type="Line" event-name="bci:fft" class="block block-75"></bci-frequency>
<bci-frequency type="line" event-name="bci:fft" class="block block-75"></bci-frequency>
</section>
<section class="row" ng-if="mode == 'frequencyRadar'">
<bci-frequency type="Radar" event-name="bci:fft" class="block block-75"></bci-frequency>
<bci-frequency type="radar" event-name="bci:fft" class="block block-75"></bci-frequency>
</section>
<section class="row" ng-if="mode == 'filtered'">
app/visualizer.js
+18 -18
Ver Arquivo
@@ -6,24 +6,24 @@
.config(bciDashboardConfig);
function bciDashboardConfig (ChartJsProvider) {
ChartJsProvider.setOptions({
animation: false,
responsive: true,
datasetStrokeWidth: 1,
pointDot: false,
pointDotRadius: 1,
pointDotStrokeWidth: 0,
datasetFill: false,
scaleOverride: true,
scaleStartValue: -2,
scaleStepWidth: 1,
scaleSteps: 6,
barShowStroke: false,
barValueSpacing: 1,
barShowStroke: true,
barStrokeWidth: 1,
strokeColor: 'rgba(116,150,161,1)'
});
//ChartJsProvider.setOptions({
// animation: false,
// responsive: true,
// datasetStrokeWidth: 1,
// pointDot: false,
// pointDotRadius: 1,
// pointDotStrokeWidth: 0,
// datasetFill: false,
// scaleOverride: true,
// scaleStartValue: -2,
// scaleStepWidth: 1,
// scaleSteps: 6,
// barShowStroke: false,
// barValueSpacing: 1,
// barShowStroke: true,
// barStrokeWidth: 1,
// strokeColor: 'rgba(116,150,161,1)'
//});
}
})();
package.json
+2 -2
Ver Arquivo
@@ -14,8 +14,8 @@
"scripts": {},
"dependencies": {
"angular": "^1.5.5",
"angular-chart.js": "^0.10.2",
"chart.js": "^1.1.1",
"angular-chart.js": "^1.0.0-alpha6",
"chart.js": "^2.0.2",
"dsp.js": "neurojs/dsp.js",
"express": "^4.13.4",
"jstat": "^1.5.2",