Changeset 2434 for trunk/packages/vizservers

Timestamp:

Aug 28, 2011 2:53:39 PM (13 years ago)

Author:

ldelgass

Message:

When setting visibility of all axes, use the current set of enabled axes, don't
force all individual axes on -- this prevents axes being enabled that shouldn't
be when dataset is 2D.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpVtkRenderer.cpp (modified) (8 diffs)
• protocol.txt (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -951 +951 @@
         _cubeAxesActor2D->GetYAxisActor2D()->GetTitleTextProperty()->SetColor(color);
         _cubeAxesActor2D->GetYAxisActor2D()->GetLabelTextProperty()->SetColor(color);
+        _cubeAxesActor2D->GetZAxisActor2D()->GetTitleTextProperty()->SetColor(color);
+        _cubeAxesActor2D->GetZAxisActor2D()->GetLabelTextProperty()->SetColor(color);
 #else
         _cubeAxesActor2D->GetAxisTitleTextProperty()->SetColor(color);
@@ -960 +962 @@
 
 /**
- * \brief Turn on/off rendering of all axes
+ * \brief Turn on/off rendering of all enabled axes
  */
 void Renderer::setAxesVisibility(bool state)
@@ -972 +974 @@
         _needsRedraw = true;
     }
-    setAxisVisibility(X_AXIS, state);
-    setAxisVisibility(Y_AXIS, state);
-    setAxisVisibility(Z_AXIS, state);
 }
 
@@ -1050 +1049 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->SetYAxisVisibility((state ? 1 : 0));
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->SetZAxisVisibility((state ? 1 : 0));
         }
         _needsRedraw = true;
@@ -1092 +1093 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->GetYAxisActor2D()->SetLabelVisibility((state ? 1 : 0));
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->GetZAxisActor2D()->SetLabelVisibility((state ? 1 : 0));
         }
         _needsRedraw = true;
@@ -1117 +1120 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->GetYAxisActor2D()->SetTickVisibility((state ? 1 : 0));
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->GetZAxisActor2D()->SetTickVisibility((state ? 1 : 0));
         }
         _needsRedraw = true;
@@ -1142 +1147 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->SetYLabel(title);
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->SetZLabel(title);
         }
         _needsRedraw = true;
@@ -1168 +1175 @@
         } else if (axis == Y_AXIS) {
             _cubeAxesActor2D->SetYUnits(units);
+        } else if (axis == Z_AXIS) {
+            _cubeAxesActor2D->SetZUnits(units);
         }
         _needsRedraw = true;

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -40 +40 @@
 axis visible <axis> <bool>
      <axis> = x|y|z|all
+     Note: 'all' means all enabled axes.  To force all axes on, set each axis on
+     individually -- however, it is best to let the server determine which of 
+     the individual axes are enabled based on the dataset bounds.
 
 camera get