Changeset 4171 for trunk

Timestamp:

Feb 8, 2014 1:31:45 AM (10 years ago)

Author:

ldelgass

Message:

Use bounds of only visible objects when computing scene bounds for axis bounds/
range and 2D camera offset. This fixes a problem with contour/heightmap
sequences, where non-visible datasets can be in 3D mode while the visible
dataset is in 2D mode.

File:

• trunk/packages/vizservers/vtkvis/Renderer.cpp (modified) (4 diffs)

trunk/packages/vizservers/vtkvis/Renderer.cpp

@@ -509 +509 @@
             _axesAutoBounds[Y_AXIS] ||
             _axesAutoBounds[Z_AXIS]) {
-            collectBounds(newBounds, false);
+            collectBounds(newBounds, true);
         }
     }
@@ -744 +744 @@
     double bounds[6];
     if (_cameraMode == IMAGE) {
-        collectBounds(bounds, false);
+        collectBounds(bounds, true);
     } else
         _cubeAxesActor->GetBounds(bounds);
 
     double unscaledBounds[6];
-    collectUnscaledBounds(unscaledBounds, false);
+    collectUnscaledBounds(unscaledBounds, true);
 
     if (_axesRangeMode[X_AXIS] == RANGE_AUTO) {
@@ -4278 +4278 @@
 
     double bounds[6];
-    collectBounds(bounds, false);
+    collectBounds(bounds, true);
     bool twod = is2D(bounds, &_imgCameraPlane, &_imgCameraOffset);
     if (twod) {
@@ -4506 +4506 @@
 {
     double bounds[6];
-    collectBounds(bounds, false);
+    collectBounds(bounds, true);
 
     switch (axis) {