Changeset 3305 for branches/nanovis2/packages/vizservers/vtkvis/RpGlyphs.cpp

Timestamp:

Feb 18, 2013, 2:32:14 PM (11 years ago)

Author:

ldelgass

Message:

sync with trunk

Location:

branches/nanovis2

Files:

• . (modified) (1 prop)
• packages/vizservers/vtkvis/RpGlyphs.cpp (modified) (18 diffs)

branches/nanovis2/packages/vizservers/vtkvis/RpGlyphs.cpp

@@ -1 +1 @@
 /* -*- mode: c++; c-basic-offset: 4; indent-tabs-mode: nil -*- */
 /*
- * Copyright (C) 2011, Purdue Research Foundation
+ * Copyright (C) 2004-2012  HUBzero Foundation, LLC
  *
  * Author: Leif Delgass <ldelgass@purdue.edu>
@@ -9 +9 @@
 #include <cfloat>
 
+#include <vtkVersion.h>
+#if (VTK_MAJOR_VERSION >= 6)
+#define USE_VTK6
+#endif
 #include <vtkDataSet.h>
 #include <vtkPointData.h>
@@ -171 +175 @@
     }
 
-#ifdef HAVE_GLYPH3D_MAPPER
     if (_glyphMapper != NULL) {
         _glyphMapper->SetSourceConnection(_glyphSource->GetOutputPort());
     }
-#else
-    if (_glyphGenerator != NULL) {
-        _glyphGenerator->SetSourceConnection(_glyphSource->GetOutputPort());
-    }
-#endif
 
     //setQuality(0.8);
@@ -211 +209 @@
         break;
     case CYLINDER: {
-        assert (vtkTransformPolyDataFilter::SafeDownCast(_glyphSource) != NULL);
-        assert (vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInput() != NULL);
-        TRACE("gsource input: %s", vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInput()->GetClassName());
-        vtkSmartPointer<vtkCylinderSource> csource = vtkCylinderSource::SafeDownCast(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInput()->GetProducerPort());
+        assert(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource) != NULL);
+        assert(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInputConnection(0, 0) != NULL);
+        vtkSmartPointer<vtkCylinderSource> csource = vtkCylinderSource::SafeDownCast(vtkTransformPolyDataFilter::SafeDownCast(_glyphSource)->GetInputConnection(0, 0));
         int res = (int)(quality * 25);
         if (res < 5) res = 5;
@@ -236 +233 @@
     vtkDataSet *ds = _dataSet->getVtkDataSet();
 
-#ifdef HAVE_GLYPH3D_MAPPER
     if (_glyphMapper == NULL) {
         _glyphMapper = vtkSmartPointer<vtkGlyph3DMapper>::New();
@@ -242 +238 @@
         _glyphMapper->ScalarVisibilityOn();
     }
-#else
-    if (_glyphGenerator == NULL) {
-        _glyphGenerator = vtkSmartPointer<vtkGlyph3D>::New();
-    }
-    if (_pdMapper == NULL) {
-        _pdMapper = vtkSmartPointer<vtkPolyDataMapper>::New();
-        _pdMapper->SetResolveCoincidentTopologyToPolygonOffset();
-        _pdMapper->ScalarVisibilityOn();
-        _pdMapper->SetInputConnection(_glyphGenerator->GetOutputPort());
-    }
-#endif
 
     initProp();
@@ -267 +252 @@
             cellToPtData = 
                 vtkSmartPointer<vtkCellDataToPointData>::New();
+#ifdef USE_VTK6
+            cellToPtData->SetInputData(ds);
+#else
             cellToPtData->SetInput(ds);
+#endif
             //cellToPtData->PassCellDataOn();
             cellToPtData->Update();
@@ -276 +265 @@
     }
 
-#ifdef HAVE_GLYPH3D_MAPPER
+#ifdef USE_VTK6
+    _glyphMapper->SetInputData(ds);
+#else
     _glyphMapper->SetInputConnection(ds->GetProducerPort());
-#else
-    _glyphGenerator->SetInput(ds);
 #endif
 
@@ -300 +289 @@
 
     // Normalize sizes to [0,1] * ScaleFactor
-#ifdef HAVE_GLYPH3D_MAPPER
     _glyphMapper->SetClamping(_normalizeScale ? 1 : 0);
     _glyphMapper->SetScaleFactor(_scaleFactor * _dataScale);
     _glyphMapper->ScalingOn();
-#else
-    _glyphGenerator->SetClamping(_normalizeScale ? 1 : 0);
-    _glyphGenerator->SetScaleFactor(_scaleFactor * _dataScale);
-    _glyphGenerator->ScalingOn();
-#endif
 
     if (_lut == NULL) {
@@ -322 +305 @@
     }
 
-#ifdef HAVE_GLYPH3D_MAPPER
     getActor()->SetMapper(_glyphMapper);
     _glyphMapper->Update();
-#else
-    getActor()->SetMapper(_pdMapper);
-    _pdMapper->Update();
-#endif
 }
 
@@ -339 +317 @@
     if (_normalizeScale != normalize) {
         _normalizeScale = normalize;
-#ifdef HAVE_GLYPH3D_MAPPER
         if (_glyphMapper != NULL) {
             _glyphMapper->SetClamping(_normalizeScale ? 1 : 0);
         }
-#else
-        if (_glyphGenerator != NULL) {
-            _glyphGenerator->SetClamping(_normalizeScale ? 1 : 0);
-        }
-#endif
-    }
-}
-
-#ifdef HAVE_GLYPH3D_MAPPER
+    }
+}
+
 /**
  * \brief Turn on/off orienting glyphs from a vector field
@@ -635 +606 @@
 }
 
-#else
-
-/**
- * \brief Control how glyphs are scaled
- */
-void Glyphs::setScalingMode(ScalingMode mode)
-{
-    _scalingMode = mode;
-    if (_glyphGenerator != NULL) {
-        switch (mode) {
-        case SCALE_BY_SCALAR:
-            _glyphGenerator->SetRange(_dataRange);
-            _glyphGenerator->SetScaleModeToScaleByScalar();
-            break;
-        case SCALE_BY_VECTOR_MAGNITUDE:
-            _glyphGenerator->SetRange(_vectorMagnitudeRange);
-            _glyphGenerator->SetScaleModeToScaleByVector();
-            break;
-        case SCALE_BY_VECTOR_COMPONENTS: {
-            double sizeRange[2];
-            sizeRange[0] = _vectorComponentRange[0][0];
-            sizeRange[1] = _vectorComponentRange[0][1];
-            sizeRange[0] = min2(sizeRange[0], _vectorComponentRange[1][0]);
-            sizeRange[1] = max2(sizeRange[1], _vectorComponentRange[1][1]);
-            sizeRange[0] = min2(sizeRange[0], _vectorComponentRange[2][0]);
-            sizeRange[1] = max2(sizeRange[1], _vectorComponentRange[2][1]);
-            _glyphGenerator->SetRange(sizeRange);
-            _glyphGenerator->SetScaleModeToScaleByVectorComponents();
-        }
-            break;
-        case SCALING_OFF:
-        default:
-            _glyphGenerator->SetScaleModeToDataScalingOff();
-        }
-    }
-}
-
-/**
- * \brief Control how glyphs are colored
- */
-void Glyphs::setColorMode(ColorMode mode)
-{
-    _colorMode = mode;
-    if (_glyphGenerator != NULL) {
-        switch (mode) {
-        case COLOR_BY_VECTOR_MAGNITUDE:
-            _glyphGenerator->SetColorModeToColorByVector();
-            _pdMapper->ScalarVisibilityOn();
-            if (_lut != NULL) {
-                _lut->SetVectorModeToMagnitude();
-                _lut->SetRange(_vectorMagnitudeRange);
-            }
-            break;
-        case COLOR_BY_SCALAR:
-            _glyphGenerator->SetColorModeToColorByScalar();
-            _pdMapper->ScalarVisibilityOn();
-            if (_lut != NULL) {
-                _lut->SetRange(_dataRange);
-            }
-            break;
-        case COLOR_CONSTANT:
-            _pdMapper->ScalarVisibilityOff();
-            break;
-        default:
-            ERROR("Unsupported ColorMode: %d", mode);
-        }
-    }
-}
-
-#endif
-
 /**
  * \brief Turn on/off orienting glyphs from a vector field
@@ -711 +611 @@
 void Glyphs::setOrient(bool state)
 {
-#ifdef HAVE_GLYPH3D_MAPPER
     if (_glyphMapper != NULL) {
         _glyphMapper->SetOrient(state ? 1 : 0);
     }
-#else
-    if (_glyphGenerator != NULL) {
-        _glyphGenerator->SetOrient(state ? 1 : 0);
-    }
-#endif
 }
 
@@ -728 +622 @@
 {
     _scaleFactor = scale;
-#ifdef HAVE_GLYPH3D_MAPPER
     if (_glyphMapper != NULL) {
         _glyphMapper->SetScaleFactor(_scaleFactor * _dataScale);
     }
-#else
-    if (_glyphGenerator != NULL) {
-        _glyphGenerator->SetScaleFactor(_scaleFactor * _dataScale);
-    }
-#endif
 }
 
@@ -767 +655 @@
 
     // Need to update color map ranges and/or active vector field
-#ifdef HAVE_GLYPH3D_MAPPER
     double *rangePtr = _colorFieldRange;
     if (_colorFieldRange[0] > _colorFieldRange[1]) {
@@ -779 +666 @@
     }
     setScalingMode(_scalingMode, _scalingFieldName.c_str(), rangePtr);
-#else
-    setColorMode(_colorMode);
-    setScalingMode(_scalingMode);
-#endif
 }
 
@@ -805 +688 @@
     if (_lut == NULL) {
         _lut = vtkSmartPointer<vtkLookupTable>::New();
-#ifdef HAVE_GLYPH3D_MAPPER
         if (_glyphMapper != NULL) {
             _glyphMapper->UseLookupTableScalarRangeOn();
             _glyphMapper->SetLookupTable(_lut);
         }
-#else
-        if (_pdMapper != NULL) {
-            _pdMapper->UseLookupTableScalarRangeOn();
-            _pdMapper->SetLookupTable(_lut);
-        }
-#endif
         _lut->DeepCopy(cmap->getLookupTable());
         switch (_colorMode) {
@@ -872 +748 @@
 void Glyphs::setClippingPlanes(vtkPlaneCollection *planes)
 {
-#ifdef HAVE_GLYPH3D_MAPPER
     if (_glyphMapper != NULL) {
         _glyphMapper->SetClippingPlanes(planes);
     }
-#else
-    if (_pdMapper != NULL) {
-        _pdMapper->SetClippingPlanes(planes);
-    }
-#endif
-}
+}