[Deba] resolving paper and location of linechart

codeignition · Jul 10, 2014 · 3edc209 · 3edc209
1 parent 47afeed
commit 3edc209
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 19 deletions.
diff --git a/public/modules/databases/directives/linechart.client.directive.js b/public/modules/databases/directives/linechart.client.directive.js
@@ -2,22 +2,30 @@
 
 angular.module('databases')
 .directive('linechart', [
-	function() {
-    var directive = {};
-    directive.restrict = 'E';
-    directive.scope = {
-      mem:'=mem',
-      time:'=time'
-    };
+  function() {
+  var directive = {};
+  directive.restrict = 'E';
+  directive.scope = {
+    mem:'=mem',
+    time:'=time'
+  };
 
-    directive.link = function(scope, element, attrs){
-      scope.$watch( function(){
-        var linePaper = Raphael(500, 500, 1000, 1000);
-        if(scope.time&&scope.mem)linePaper.linechart(100,100,500,500, scope.time, scope.mem,{axis:'0 0 1 1', symbol: 'circle', smooth:false});
-        scope.$on('$destroy', function(){
-          linePaper.remove();
-        });
+  directive.link = function(scope, element, attrs){
+    var timeArray;
+    var memArray;
+    var entry=true;
+    scope.$watch( function(){
+      var timeArray=scope.time;
+      var memArray=scope.mem;
+      if(timeArray&&memArray&&entry){
+        entry=false;
+        var linePaper = Raphael('line');
+        linePaper.linechart(50,10,300,300, timeArray, memArray,{axis:'0 0 1 1', symbol: 'circle', smooth:false});
+      };
+      scope.$on('$destroy', function(){
+        linePaper.remove();
       });
-    };
-		return directive;
-	}]);
+    });
+  };
+  return directive;
+}]);
diff --git a/public/modules/databases/views/view-database.client.view.html b/public/modules/databases/views/view-database.client.view.html
@@ -52,8 +52,8 @@ <h3>Redis Info for "{{database.name}}"</h3>
         </div>
       </form>
     </div>
-    <div class="col-md-4">
-      <linechart mem="infodbArr1"  time="infodbArr2"><div></div></linechart>
+    <div class="col-md-4 col-md-offset-1">
+      <linechart mem="infodbArr1"  time="infodbArr2"><div id="line"></div></linechart>
     </div>
   </div>
 </section>