diff options
Diffstat (limited to 'www')
| -rw-r--r-- | www/js/TimelineCtrl.js | 1 | ||||
| -rw-r--r-- | www/js/TimelineModalCtrl.js | 11 | ||||
| -rw-r--r-- | www/templates/timeline-modal.html | 19 |
3 files changed, 24 insertions, 7 deletions
diff --git a/www/js/TimelineCtrl.js b/www/js/TimelineCtrl.js index 9c0f966e..c30c141a 100644 --- a/www/js/TimelineCtrl.js +++ b/www/js/TimelineCtrl.js @@ -203,6 +203,7 @@ angular.module('zmApp.controllers').controller('zmApp.TimelineCtrl', ['$ionicPla // $interval.cancel(eventsInterval); //$interval.cancel(segmentHandle); ZMDataModel.zmDebug("TimelineCtrl:Close & Destroy Modal"); + ZMDataModel.stopNetwork("TimelineCtrl: closeModal"); ZMDataModel.setAwake(false); if ($scope.modal !== undefined) { $scope.modal.remove(); diff --git a/www/js/TimelineModalCtrl.js b/www/js/TimelineModalCtrl.js index 9895bc4c..535e8f14 100644 --- a/www/js/TimelineModalCtrl.js +++ b/www/js/TimelineModalCtrl.js @@ -94,6 +94,8 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' $scope.$on('modal.shown', function () { + $scope.graphWidth=$rootScope.devWidth-30; + ZMDataModel.zmLog ("Setting init graph width to " + $scope.graphWidth); $scope.dataReady = false; ZMDataModel.getKeyConfigParams(0) @@ -192,6 +194,12 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' legendTemplate : '<ul class="tc-chart-js-legend"><% for (var i=0; i<datasets.length; i++){%><li><span style="background-color:<%=datasets[i].fillColor%>"></span><%if(datasets[i].label){%><%=datasets[i].label%><%}%></li><%}%></ul>' }; + $scope.graphWidth = event.event.Frame.length * 10; + if ($scope.graphWidth < $rootScope.devWidth) + $scope.graphWidth = $rootScope.devWidth; + + ZMDataModel.zmLog ("Changing graph width to " + $scope.graphWidth); + for (var i=0; i< event.event.Frame.length; i++) { data.labels.push(event.event.Frame[i].TimeStamp); @@ -214,7 +222,8 @@ angular.module('zmApp.controllers').controller('TimelineModalCtrl', ['$scope', ' cv = document.getElementById("tcchart"); ctx = cv.getContext("2d"); - tcGraph = new Chart(ctx,{type:'bar', data: data, options:options}); + $timeout(function() { + tcGraph = new Chart(ctx,{type:'bar', data: data, options:options});}); cv.onclick = function(e) { diff --git a/www/templates/timeline-modal.html b/www/templates/timeline-modal.html index 0a3b1358..e5579d8c 100644 --- a/www/templates/timeline-modal.html +++ b/www/templates/timeline-modal.html @@ -19,25 +19,32 @@ <i class="ion-chevron-down"></i> </button> - - {{errorDetails}} - <p>please zoom in for more precise control</p> + <!--<p>scroll left/right if needed</p>--> </center> <div style="padding-left:15px; padding-right:15px;"> <div id="timeline-alarm-vis" ></div> <!--<canvas id="tc" tc-chartjs-bar chart-options="options" chart-data="data" auto-legend ng-if="dataReady" chart="tcchart" ng-click="chartClick($event)"></canvas>--> + + + <!-- <ion-scroll direction="x" > + <div style="width:{{graphWidth}}px;">--> + <canvas id="tcchart"></canvas> + <!--</div> + </ion-scroll>--> + + + - <canvas id="tcchart"></canvas> </div> <ion-spinner icon="spiral" style="position:absolute; top:50%;left:50%" ng-if="!dataReady"></ion-spinner> <div style="height:190px;"> - <ion-scroll direction="x" class="wide-as-needed"> + <!-- <ion-scroll direction="x" class="wide-as-needed">--> <span ng-repeat="alarm in alarm_images"> @@ -50,7 +57,7 @@ </span> - </ion-scroll> + <!--</ion-scroll>--> </div> </div> </ion-content> |