Changeset 2402 for trunk/packages/vizservers/vtkvis/RpVolume.cpp

Timestamp:

Aug 22, 2011, 2:15:12 AM (13 years ago)

Author:

ldelgass

Message:

• Let graphics objects handle DataSet? cumulative range changes, track vectors as well as scalars, also supply cumulative ranges in setDataSet()
• Be more consistent about naming enums and commands for vectors
• Add constructor arguments to some graphics objects to speed initialization (eliminates some pipeline changes)
• Apply a scale factor to glyphs based on cell sizes
• Add line glyph shape
• Don't delete ColorMaps? in use
• Update graphics objects when a ColorMap? is edited

File:

• trunk/packages/vizservers/vtkvis/RpVolume.cpp (modified) (3 diffs)

trunk/packages/vizservers/vtkvis/RpVolume.cpp

@@ -63 +63 @@
     vtkDataSet *ds = _dataSet->getVtkDataSet();
 
-    double dataRange[2];
-    _dataSet->getDataRange(dataRange);
-
-    TRACE("DataSet type: %s, range: %g - %g", _dataSet->getVtkType(),
-          dataRange[0], dataRange[1]);
-
     if (vtkImageData::SafeDownCast(ds) != NULL) {
         // Image data required for these mappers
@@ -113 +107 @@
         WARN("No scalar point data in dataset %s", _dataSet->getName().c_str());
     }
+
     if (_colorMap == NULL) {
-        _colorMap = ColorMap::getVolumeDefault();
+        setColorMap(ColorMap::getVolumeDefault());
     }
-
-    vtkVolumeProperty *volProperty = getVolume()->GetProperty();
-    volProperty->SetColor(_colorMap->getColorTransferFunction(dataRange));
-    volProperty->SetScalarOpacity(_colorMap->getOpacityTransferFunction(dataRange));
 
     getVolume()->SetMapper(_volumeMapper);
     _volumeMapper->Update();
+}
+
+void Volume::updateRanges(bool useCumulative,
+                          double scalarRange[2],
+                          double vectorMagnitudeRange[2],
+                          double vectorComponentRange[3][2])
+{
+    if (useCumulative) {
+        _dataRange[0] = scalarRange[0];
+        _dataRange[1] = scalarRange[1];
+    } else if (_dataSet != NULL) {
+        _dataSet->getScalarRange(_dataRange);
+    }
+
+    if (getVolume() != NULL) {
+        getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(_dataRange));
+        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange));
+    }
+}
+void Volume::updateColorMap()
+{
+    setColorMap(_colorMap);
 }
 
@@ -131 +144 @@
 {
     _colorMap = cmap;
+
     if (getVolume() != NULL) {
-        double dataRange[2];
-        _dataSet->getDataRange(dataRange);
-        getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(dataRange));
-        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(dataRange));
-    }
-}
-
-/**
- * \brief Assign a color map (transfer function) to use in rendering the Volume and
- * specify a scalar range for the map
- */
-void Volume::setColorMap(ColorMap *cmap, double dataRange[2])
-{
-    _colorMap = cmap;
-    if (getVolume() != NULL) {
-        getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(dataRange));
-        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(dataRange));
+        getVolume()->GetProperty()->SetColor(_colorMap->getColorTransferFunction(_dataRange));
+        getVolume()->GetProperty()->SetScalarOpacity(_colorMap->getOpacityTransferFunction(_dataRange));
     }
 }