Changeset 2761 for trunk

Timestamp:

Jan 12, 2012, 2:35:17 PM (13 years ago)

Author:

ldelgass

Message:

Fix cutplane colormapping when gaussian splatter is used to convert point cloud
to volume. Note that splatter only works on the active scalar field, so the
colormode subcommand can not be used on vector fields or to change scalar
fields, instead the dataset scalar command must be used to change the active
scalar field.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpCutplane.cpp (modified) (4 diffs)
• RpCutplane.h (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/RpCutplane.cpp

@@ -231 +231 @@
             }
 #else
-            vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New();
-            splatter->SetInput(pd);
+            if (_splatter == NULL) {
+                _splatter = vtkSmartPointer<vtkGaussianSplatter>::New();
+            }
+            _splatter->SetInput(pd);
             int dims[3];
-            splatter->GetSampleDimensions(dims);
+            _splatter->GetSampleDimensions(dims);
             TRACE("Sample dims: %d %d %d", dims[0], dims[1], dims[2]);
             if (plane == PLANE_ZY) {
@@ -243 +245 @@
                 dims[2] = 3;
             }
-            splatter->SetSampleDimensions(dims);
+            _splatter->SetSampleDimensions(dims);
             for (int i = 0; i < 3; i++) {
-                _cutter[i]->SetInputConnection(splatter->GetOutputPort());
+                _cutter[i]->SetInputConnection(_splatter->GetOutputPort());
                 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
                 gf->UseStripsOn();
@@ -267 +269 @@
             }
 #else
-            vtkSmartPointer<vtkGaussianSplatter> splatter = vtkSmartPointer<vtkGaussianSplatter>::New();
-            splatter->SetInput(pd);
+            if (_splatter == NULL) {
+                _splatter = vtkSmartPointer<vtkGaussianSplatter>::New();
+            }
+            _splatter->SetInput(pd);
             int dims[3];
             dims[0] = dims[1] = dims[2] = 64;
             TRACE("Generating volume with dims (%d,%d,%d) from point cloud",
                   dims[0], dims[1], dims[2]);
-            splatter->SetSampleDimensions(dims);
+            _splatter->SetSampleDimensions(dims);
             for (int i = 0; i < 3; i++) {
-                _cutter[i]->SetInputConnection(splatter->GetOutputPort());
+                _cutter[i]->SetInputConnection(_splatter->GetOutputPort());
                 vtkSmartPointer<vtkDataSetSurfaceFilter> gf = vtkSmartPointer<vtkDataSetSurfaceFilter>::New();
                 gf->UseStripsOn();
@@ -527 +531 @@
     }
 
-    if (name != NULL && strlen(name) > 0) {
+    if (_splatter != NULL) {
+        for (int i = 0; i < 3; i++) {
+            _mapper[i]->SelectColorArray("SplatterValues");
+        }
+    } else if (name != NULL && strlen(name) > 0) {
         for (int i = 0; i < 3; i++) {
             _mapper[i]->SelectColorArray(name);

trunk/packages/vizservers/vtkvis/RpCutplane.h

@@ -17 +17 @@
 #include <vtkPlane.h>
 #include <vtkOutlineFilter.h>
+#include <vtkGaussianSplatter.h>
 
 #include "ColorMap.h"
@@ -108 +109 @@
     vtkSmartPointer<vtkPlane> _cutPlane[3];
     vtkSmartPointer<vtkOutlineFilter> _outlineFilter[3];
+    vtkSmartPointer<vtkGaussianSplatter> _splatter;
 };