svn commit: r1451762 - in /accumulo/branches/1.5: ./ assemble/ core/ examples/ fate/src/main/java/org/apache/accumulo/fate/ fate/src/main/java/org/apache/accumulo/fate/zookeeper/ server/ server/src/main/java/org/apache/accumulo/server/monitor/servlets/...

Fri, 01 Mar 2013 15:13:46 -0800 

Author: billie
Date: Fri Mar  1 23:13:21 2013
New Revision: 1451762

URL: http://svn.apache.org/r1451762
Log:
ACCUMULO-1127 merged disabling of dot motion to 1.5 branch

Modified:
    accumulo/branches/1.5/   (props changed)
    accumulo/branches/1.5/assemble/   (props changed)
    accumulo/branches/1.5/core/   (props changed)
    accumulo/branches/1.5/examples/   (props changed)
    
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java 
  (props changed)
    
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
   (props changed)
    accumulo/branches/1.5/server/   (props changed)
    
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
    accumulo/branches/1.5/server/src/main/resources/web/vis.js
    accumulo/branches/1.5/src/   (props changed)

Propchange: accumulo/branches/1.5/
------------------------------------------------------------------------------
  Merged /accumulo/trunk:r1451208

Propchange: accumulo/branches/1.5/assemble/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/assemble:r1451208

Propchange: accumulo/branches/1.5/core/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/core:r1451208

Propchange: accumulo/branches/1.5/examples/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/examples:r1451208

Propchange: 
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
------------------------------------------------------------------------------
  Merged 
/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java:r1451208

Propchange: 
accumulo/branches/1.5/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java
------------------------------------------------------------------------------
  Merged 
/accumulo/trunk/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooSession.java:r1451208

Propchange: accumulo/branches/1.5/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/server:r1451208

Modified: 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java?rev=1451762&r1=1451761&r2=1451762&view=diff
==============================================================================
--- 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
 (original)
+++ 
accumulo/branches/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
 Fri Mar  1 23:13:21 2013
@@ -176,7 +176,8 @@ public class VisServlet extends BasicSer
         .append(">80</option></select></span>\n");
     // motion select box
     sb.append("&nbsp;&nbsp<span class='viscontrol'>Motion: <select id='motion' 
onchange='setMotion(this)'>");
-    addOptions(sb, cfg.motion);
+    sb.append("<option selected='true'></option>");
+    addOptions(sb, null);
     sb.append("</select></span>\n");
     // color select box
     sb.append("&nbsp;&nbsp<span class='viscontrol'>Color: <select id='color' 
onchange='setColor(this)'>");

Modified: accumulo/branches/1.5/server/src/main/resources/web/vis.js
URL: 
http://svn.apache.org/viewvc/accumulo/branches/1.5/server/src/main/resources/web/vis.js?rev=1451762&r1=1451761&r2=1451762&view=diff
==============================================================================
--- accumulo/branches/1.5/server/src/main/resources/web/vis.js (original)
+++ accumulo/branches/1.5/server/src/main/resources/web/vis.js Fri Mar  1 
23:13:21 2013
@@ -47,6 +47,7 @@ canvas.addEventListener('click', goToSer
 var main = document.getElementById('main');
 var speedStatType;
 var colorStatType;
+var speedDisabled = true;
 var useCircles = true;
 setShape(document.getElementById('shape'));
 setSize(document.getElementById('size'));
@@ -178,7 +179,7 @@ function drawDots() {
       strokeDot(x,y,maxDotRadius-1,deadColor);
       continue;
     }
-    if (Math.floor(dots[i].size) > maxDotRadius) {
+    if (speedDisabled || Math.floor(dots[i].size) > maxDotRadius) {
       // check for resize by the user
       dots[i].size = maxDotRadius;
     } else if (server[speedStatType]<=0) {
@@ -325,7 +326,12 @@ function setSize(obj) {
 
 // callback for motion selection
 function setMotion(obj) {
-  var i = 0;
+  if (obj.selectedIndex==0) {
+    speedDisabled = true;
+    setState();
+    return;
+  }
+  var i = 1;
   for (var s in statNames) {
     if (i==obj.selectedIndex) {
       speedStatType = s;
@@ -333,6 +339,7 @@ function setMotion(obj) {
     }
     i++;
   }
+  speedDisabled = false;
   setState();
 }
 
@@ -383,7 +390,7 @@ function showId(e) {
 }
 
 function setState() {
-  var url = 
visurl+'?shape='+(useCircles?'circles':'squares')+'&size='+(dotSpacing*2)+'&motion='+speedStatType+'&color='+colorStatType;
+  var url = 
visurl+'?shape='+(useCircles?'circles':'squares')+'&size='+(dotSpacing*2)+(speedDisabled
 ? '' : '&motion='+speedStatType)+'&color='+colorStatType;
   window.history.replaceState(window.history.state,'Server Activity',url);
 }
 

Propchange: accumulo/branches/1.5/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1451208

Reply via email to