Changeset 2459 for trunk/packages/vizservers/vtkvis/RpLIC.cpp

Timestamp:

Sep 2, 2011 1:08:15 AM (13 years ago)

Author:

ldelgass

Message:

LIC fixes: mask out out-of-bounds sample points from probe filter, run a cutter
before probing to make the probe run faster. A few other misc. cleanups.

File:

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

trunk/packages/vizservers/vtkvis/RpLIC.cpp

@@ -18 +18 @@
 #include <vtkPainterPolyDataMapper.h>
 #include <vtkDataSetSurfaceFilter.h>
+#include <vtkCutter.h>
+#include <vtkImageMask.h>
+#include <vtkImageCast.h>
 
 #include "RpLIC.h"
@@ -106 +109 @@
         }
 
+        // Need to convert to vtkImageData
         double bounds[6];
         ds->GetBounds(bounds);
@@ -116 +120 @@
         if (ySize < xSize && ySize < zSize)
             minDir = 1;
-        // Sample a plane within the grid bounding box
         if (_probeFilter == NULL)
             _probeFilter = vtkSmartPointer<vtkProbeFilter>::New();
-        _probeFilter->SetSource(ds);
+
+        if (!_dataSet->is2D()) {
+            // Sample a plane within the grid bounding box
+            vtkSmartPointer<vtkCutter> cutter = vtkSmartPointer<vtkCutter>::New();
+            if (_cutPlane == NULL) {
+                _cutPlane = vtkSmartPointer<vtkPlane>::New();
+            }
+            if (minDir == 0) {
+                _cutPlane->SetNormal(1, 0, 0);
+                _cutPlane->SetOrigin(bounds[0] + (bounds[1]-bounds[0])/2.,
+                                     0,
+                                     0);
+            } else if (minDir == 1) {
+                _cutPlane->SetNormal(0, 1, 0);
+                _cutPlane->SetOrigin(0,
+                                     bounds[2] + (bounds[3]-bounds[2])/2.,
+                                     0);
+            } else {
+                _cutPlane->SetNormal(0, 0, 1);
+                _cutPlane->SetOrigin(0,
+                                     0,
+                                     bounds[4] + (bounds[5]-bounds[4])/2.);
+            }
+            cutter->SetInput(ds);
+            cutter->SetCutFunction(_cutPlane);
+            _probeFilter->SetSourceConnection(cutter->GetOutputPort());
+        } else {
+            _probeFilter->SetSource(ds);
+        }
+
         vtkSmartPointer<vtkImageData> imageData = vtkSmartPointer<vtkImageData>::New();
         int xdim, ydim, zdim;
@@ -165 +197 @@
         if (_mapper == NULL) {
             _mapper = vtkSmartPointer<vtkDataSetMapper>::New();
-        }
-        _mapper->SetInputConnection(_lic->GetOutputPort());
+            _mapper->SetColorModeToMapScalars();
+        }
+        _lic->Update();
+        vtkSmartPointer<vtkImageCast> cast = vtkSmartPointer<vtkImageCast>::New();
+        cast->SetInputConnection(_probeFilter->GetOutputPort());
+        cast->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS,
+                                     _probeFilter->GetValidPointMaskArrayName());
+        cast->SetOutputScalarTypeToUnsignedChar();
+        vtkSmartPointer<vtkImageMask> mask = vtkSmartPointer<vtkImageMask>::New();
+        mask->SetInputConnection(0, _lic->GetOutputPort());
+        mask->SetInputConnection(1, cast->GetOutputPort());
+        _mapper->SetInputConnection(mask->GetOutputPort());
     } else {
         // DataSet is a PolyData
@@ -243 +285 @@
         double bounds[6];
         assert(vtkDataSet::SafeDownCast(_probeFilter->GetSource()) != NULL);
-        vtkDataSet::SafeDownCast(_probeFilter->GetSource())->GetBounds(bounds);
+        _dataSet->getBounds(bounds);
         int dim = 128;
 
@@ -253 +295 @@
                                   (bounds[3]-bounds[2])/((double)(dim-1)), 
                                   (bounds[5]-bounds[4])/((double)(dim-1)));
+            if (_cutPlane != NULL) {
+                _cutPlane->SetNormal(1, 0, 0);
+                _cutPlane->SetOrigin(bounds[0] + (bounds[1]-bounds[0])*ratio, 0, 0);
+            }
             break;
         case Y_AXIS:
@@ -260 +306 @@
                                   0,
                                   (bounds[5]-bounds[4])/((double)(dim-1)));
+            if (_cutPlane != NULL) {
+                _cutPlane->SetNormal(0, 1, 0);
+                _cutPlane->SetOrigin(0, bounds[2] + (bounds[3]-bounds[2])*ratio, 0);
+            }
             break;
         case Z_AXIS:
@@ -267 +317 @@
                                   (bounds[3]-bounds[2])/((double)(dim-1)),
                                   0);
+            if (_cutPlane != NULL) {
+                _cutPlane->SetNormal(0, 0, 1);
+                _cutPlane->SetOrigin(0, 0, bounds[4] + (bounds[5]-bounds[4])*ratio);
+            }
             break;
         default:
@@ -305 +359 @@
     }
 
+    if (_lic != NULL)
+        _lic->Update();
+
     if (_mapper != NULL)
         _mapper->Update();
@@ -330 +387 @@
         _lut = vtkSmartPointer<vtkLookupTable>::New();
         if (_mapper != NULL) {
-            _mapper->UseLookupTableScalarRangeOn();
+            _mapper->UseLookupTableScalarRangeOff();
             _mapper->SetLookupTable(_lut);
         }