Changeset 4603 for vtkvis/branches

Timestamp:

Aug 2, 2014 12:20:58 AM (10 years ago)

Author:

ldelgass

Message:

merge r4060 from trunk

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• LIC.cpp (modified) (6 diffs)
• LIC.h (modified) (1 diff)
• cf/install-sh (modified) (1 prop)
• cf/mkinstalldirs (modified) (1 prop)

vtkvis/branches/1.7/LIC.cpp

@@ -33 +33 @@
     GraphicsObject(),
     _sliceAxis(Z_AXIS),
-    _colorMap(NULL)
+    _colorMap(NULL),
+    _resolution(128)
 {
 }
@@ -230 +231 @@
         int xdim, ydim, zdim;
         double origin[3], spacing[3];
+        int res = _resolution;
         if (minDir == 0) {
             xdim = 1;
-            ydim = 128;
-            zdim = 128;
+            ydim = res;
+            zdim = res;
             origin[0] = bounds[0] + xSize/2.;
             origin[1] = bounds[2];
@@ -242 +244 @@
             _sliceAxis = X_AXIS;
         } else if (minDir == 1) {
-            xdim = 128;
+            xdim = res;
             ydim = 1;
-            zdim = 128;
+            zdim = res;
             origin[0] = bounds[0];
             origin[1] = bounds[2] + ySize/2.;
@@ -253 +255 @@
             _sliceAxis = Y_AXIS;
         } else {
-            xdim = 128;
-            ydim = 128;
+            xdim = res;
+            ydim = res;
             zdim = 1;
             origin[0] = bounds[0];
@@ -279 +281 @@
         }
         _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());
+        if (1) {
+            vtkSmartPointer<vtkImageData> imgData = _probeFilter->GetImageDataOutput();
+            imgData->GetPointData()->SetActiveScalars(_probeFilter->GetValidPointMaskArrayName());
+            vtkSmartPointer<vtkImageCast> maskCast = vtkSmartPointer<vtkImageCast>::New();
+            maskCast->SetInputData(imgData);
+            //maskCast->SetInputConnection(_probeFilter->GetOutputPort());
+            //maskCast->SetInputArrayToProcess(0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS,
+            //                                 _probeFilter->GetValidPointMaskArrayName());
+            maskCast->SetOutputScalarTypeToUnsignedChar();
+            vtkSmartPointer<vtkImageCast> licCast = vtkSmartPointer<vtkImageCast>::New();
+            licCast->SetInputConnection(_lic->GetOutputPort());
+            licCast->SetOutputScalarTypeToDouble();
+            vtkSmartPointer<vtkImageMask> mask = vtkSmartPointer<vtkImageMask>::New();
+            mask->SetInputConnection(0, licCast->GetOutputPort());
+            mask->SetInputConnection(1, maskCast->GetOutputPort());
+            _mapper->SetInputConnection(mask->GetOutputPort());
+        } else {
+            // Mask not working in VTK 6.1?
+            _mapper->SetInputConnection(_lic->GetOutputPort());
+        }
     } else {
         // DataSet is a 3D PolyData with cells
@@ -371 +384 @@
         assert(vtkDataSet::SafeDownCast(_probeFilter->GetSource()) != NULL);
         _dataSet->getBounds(bounds);
-        int dim = 128;
+        int dim = _resolution;
 
         switch (axis) {

vtkvis/branches/1.7/LIC.h

@@ -67 +67 @@
     Axis _sliceAxis;
     ColorMap *_colorMap;
+    int _resolution;
 
     vtkSmartPointer<vtkLookupTable> _lut;