Changeset 5827

Timestamp:

Aug 20, 2015, 5:51:49 PM (9 years ago)

Author:

ldelgass

Message:

merge r5825:5826 from vtkvis release branch

Location:

vtkvis/trunk

Files:

• . (modified) (1 prop)
• HeightMap.cpp (modified) (2 diffs)
• HeightMap.h (modified) (1 diff)
• Warp.cpp (modified) (2 diffs)
• Warp.h (modified) (1 diff)

vtkvis/trunk/HeightMap.cpp

@@ -387 +387 @@
             // DataSet is a vtkPolyData with lines and/or polygons
             vtkAlgorithmOutput *warpOutput = initWarp(dsOutput);
-            if (warpOutput != NULL) {
-                _mapper->SetInputConnection(warpOutput);
-                _contourFilter->SetInputConnection(warpOutput);
-            } else {
-                _mapper->SetInputConnection(dsOutput);
-                _contourFilter->SetInputConnection(dsOutput);
-            }
+            _mapper->SetInputConnection(warpOutput);
+            _contourFilter->SetInputConnection(warpOutput);
         } else {
             // DataSet is NOT a vtkPolyData
@@ -671 +666 @@
 }
 
-vtkAlgorithmOutput *HeightMap::initWarp(vtkDataSet *dsInput)
-{
-    TRACE("Warp scale: %g", _warpScale);
-    if (_warpScale == 0.0) {
-        _warp = NULL;
-        _normalsGenerator = NULL;
-        return NULL;
-    } else if (dsInput == NULL) {
-        ERROR("NULL input");
-        return NULL;
-    } else {
-        if (_warp == NULL)
-            _warp = vtkSmartPointer<vtkWarpScalar>::New();
-        if (_normalsGenerator == NULL)
-            _normalsGenerator = vtkSmartPointer<vtkPolyDataNormals>::New();
-        switch (_sliceAxis) {
-        case X_AXIS:
-            _warp->SetNormal(1, 0, 0);
-            break;
-        case Y_AXIS:
-            _warp->SetNormal(0, 1, 0);
-            break;
-        default:
-            _warp->SetNormal(0, 0, 1);
-        }
-        _warp->UseNormalOn();
-        _warp->SetScaleFactor(_warpScale * _dataScale);
-#ifdef USE_VTK6
-        _warp->SetInputData(dsInput);
-#else
-        _warp->SetInput(dsInput);
-#endif
-        _normalsGenerator->SetInputConnection(_warp->GetOutputPort());
-        _normalsGenerator->SetFeatureAngle(90.);
-        _normalsGenerator->AutoOrientNormalsOff();
-        _normalsGenerator->ComputePointNormalsOn();
-        return _normalsGenerator->GetOutputPort();
-    }
-}
-
 /**
  * \brief Controls relative scaling of height of mountain plot

vtkvis/trunk/HeightMap.h

@@ -140 +140 @@
 
     vtkAlgorithmOutput *initWarp(vtkAlgorithmOutput *input);
-    vtkAlgorithmOutput *initWarp(vtkDataSet *input);
 
     int _numContours;

vtkvis/trunk/Warp.cpp

@@ -185 +185 @@
     } else if (vtkPolyData::SafeDownCast(ds) != NULL) {
         // DataSet is a vtkPolyData with lines and/or polygons
-        vtkAlgorithmOutput *warpOutput = initWarp(ds);
-        if (warpOutput != NULL) {
-            _mapper->SetInputConnection(warpOutput);
-        } else {
-            _mapper->SetInputConnection(dsOutput);
-        }
+        vtkAlgorithmOutput *warpOutput = initWarp(dsOutput);
+        _mapper->SetInputConnection(warpOutput);
     } else {
         TRACE("Generating surface for data set");
@@ -250 +246 @@
         _warp->SetScaleFactor(_warpScale);
         _warp->SetInputConnection(input);
-        return _warp->GetOutputPort();
-    }
-}
-
-vtkAlgorithmOutput *Warp::initWarp(vtkDataSet *ds)
-{
-    TRACE("Warp scale: %g", _warpScale);
-    if (_warpScale == 0.0) {
-        _warp = NULL;
-        return NULL;
-    } else if (ds == NULL) {
-        ERROR("NULL input");
-        return NULL;
-    } else {
-        if (_warp == NULL)
-            _warp = vtkSmartPointer<vtkWarpVector>::New();
-        _warp->SetScaleFactor(_warpScale);
-#ifdef USE_VTK6
-        _warp->SetInputData(ds);
-#else
-        _warp->SetInput(ds);
-#endif
         return _warp->GetOutputPort();
     }

vtkvis/trunk/Warp.h

@@ -94 +94 @@
 
     vtkAlgorithmOutput *initWarp(vtkAlgorithmOutput *input);
-    vtkAlgorithmOutput *initWarp(vtkDataSet *input);
 
     double _warpScale;