Changeset 2865 for trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

Timestamp:

Mar 18, 2012 7:10:04 PM (12 years ago)

Author:

ldelgass

Message:

Use new custom vtk 3d axes (when USE_CUSTOM_AXES is defined). Fixes gridlines
in 3D.

File:

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

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -519 +519 @@
 {
     TRACE("Initializing axes");
+#ifdef USE_CUSTOM_AXES
+    if (_cubeAxesActor == NULL)
+        _cubeAxesActor = vtkSmartPointer<vtkRpCubeAxesActor>::New();
+#else
     if (_cubeAxesActor == NULL)
         _cubeAxesActor = vtkSmartPointer<vtkCubeAxesActor>::New();
+#endif
     _cubeAxesActor->SetCamera(_renderer->GetActiveCamera());
     _cubeAxesActor->GetProperty()->LightingOff();
@@ -1088 +1093 @@
  * \param[in] width Pixel width of legend (aspect controls orientation)
  * \param[in] height Pixel height of legend (aspect controls orientation)
+ * \param[in] opaque Flag to control if legend is rendered opaque or translucent
  * \param[in] numLabels Number of labels to render (includes min/max)
  * \param[in,out] imgData Pointer to array to fill with image bytes. Array
@@ -1154 +1160 @@
  * \param[in] width Pixel width of legend (aspect controls orientation)
  * \param[in] height Pixel height of legend (aspect controls orientation)
+ * \param[in] opaque Flag to control if legend is rendered opaque or translucent
  * \param[in] numLabels Number of labels to render (includes min/max)
  * \param[in,out] imgData Pointer to array to fill with image bytes. Array
@@ -1217 +1224 @@
  * \param[in] width Pixel width of legend (aspect controls orientation)
  * \param[in] height Pixel height of legend (aspect controls orientation)
+ * \param[in] opaque Flag to control if legend is rendered opaque or translucent
  * \param[in] numLabels Number of labels to render (includes min/max)
  * \param[in,out] imgData Pointer to array to fill with image bytes. Array
@@ -1981 +1989 @@
     outerGutter = (outerGutter > 15 ? 15 : outerGutter);
 
+    int imgWidthPx = _windowWidth - pxOffsetX - outerGutter;
     int imgHeightPx = _windowHeight - pxOffsetY - outerGutter;
-    int imgWidthPx = _windowWidth - pxOffsetX - outerGutter;
 
     double imgAspect = width / height;
@@ -1990 +1998 @@
 
     if (imgAspect >= winAspect) {
-        pxToWorld = width / imgWidthPx;
+        pxToWorld = width / (double)imgWidthPx;
     } else {
-        pxToWorld = height / imgHeightPx;
+        pxToWorld = height / (double)imgHeightPx;
     }