Changeset 2236 for trunk

Timestamp:

Apr 29, 2011 5:19:10 PM (13 years ago)

Author:

ldelgass

Message:

Reduce log spam on dataset visibility change, disable computing world coords
of screen for 3D camera for now (may use it later) as it requires a matrix
inversion and currently we aren't using this.

File:

• trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp (modified) (10 diffs)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -1664 +1664 @@
 }
 
+/**
+ * \brief Set the orientation of the camera from a quaternion
+ *
+ * \param[in] quat A quaternion with scalar part first: w,x,y,z
+ */
 void Renderer::setCameraOrientation(double quat[4])
 {
@@ -1707 +1712 @@
 }
 
+/**
+ * \brief Set the position and orientation of the camera
+ *
+ * \param[in] position x,y,z position of camera in world coordinates
+ * \param[in] focalPoint x,y,z look-at point in world coordinates
+ * \param[in] viewUp x,y,z up vector of camera
+ */
 void Renderer::setCameraOrientationAndPosition(double position[3],
                                                double focalPoint[3],
@@ -1719 +1731 @@
 }
 
+/**
+ * \brief Get the position and orientation of the camera
+ *
+ * \param[out] position x,y,z position of camera in world coordinates
+ * \param[out] focalPoint x,y,z look-at point in world coordinates
+ * \param[out] viewUp x,y,z up vector of camera
+ */
 void Renderer::getCameraOrientationAndPosition(double position[3],
                                                double focalPoint[3],
@@ -1899 +1918 @@
         _renderer->ResetCameraClippingRange();
         storeCameraOrientation();
-        computeScreenWorldCoords();
+        //computeScreenWorldCoords();
     }
 
@@ -1945 +1964 @@
         _renderer->ResetCameraClippingRange();
         storeCameraOrientation();
+        //computeScreenWorldCoords();
     }
 
@@ -2032 +2052 @@
 }
 
+/**
+ * \brief Convert pixel/display coordinates to world coordinates based on current camera
+ */
 void Renderer::computeDisplayToWorld(double x, double y, double z, double worldPt[4])
 {
@@ -2045 +2068 @@
 }
 
+/**
+ * \brief Convert world coordinates to pixel/display coordinates based on current camera
+ */
 void Renderer::computeWorldToDisplay(double x, double y, double z, double displayPt[3])
 {
@@ -2052 +2078 @@
 }
 
+/**
+ * \brief Compute the world coordinate bounds of the display rectangle
+ */
 void Renderer::computeScreenWorldCoords()
 {
@@ -2332 +2361 @@
 void Renderer::setOpacity(const DataSetId& id, double opacity)
 {
-    setPseudoColorOpacity(id, opacity);
-    setContourOpacity(id, opacity);
-    setPolyDataOpacity(id, opacity);
+    if (id.compare("all") == 0 || getPseudoColor(id) != NULL)
+        setPseudoColorOpacity(id, opacity);
+    if (id.compare("all") == 0 || getContour2D(id) != NULL)
+        setContourOpacity(id, opacity);
+    if (id.compare("all") == 0 || getPolyData(id) != NULL)
+        setPolyDataOpacity(id, opacity);
 }
 
@@ -2361 +2393 @@
     } while (doAll && ++itr != _dataSets.end());
 
-    setPseudoColorVisibility(id, state);
-    setContourVisibility(id, state);
-    setPolyDataVisibility(id, state);
+    if (id.compare("all") == 0 || getPseudoColor(id) != NULL)
+        setPseudoColorVisibility(id, state);
+    if (id.compare("all") == 0 || getContour2D(id) != NULL)
+        setContourVisibility(id, state);
+    if (id.compare("all") == 0 || getPolyData(id) != NULL)
+        setPolyDataVisibility(id, state);
 }