Changeset 2121 for trunk

Timestamp:

Mar 8, 2011 11:41:01 AM (13 years ago)

Author:

ldelgass

Message:

• Fix crash bug on changing camera type: set vtkPlaneCollection to NULL in

graphics objecst instead of removing planes from shared collection.

• Add method to collect cumulative data range of all loaded DataSets?
• Fix potential crash in DataSet::getDataValue if no scalars present
• Don't compute normals,gradients for 2d contours, turn of lighting by default
• Use clip planes in image camera mode for PolyData? objects

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpContour2D.cpp (modified) (3 diffs)
• RpPolyData.cpp (modified) (1 diff)
• RpPseudoColor.cpp (modified) (2 diffs)
• RpVtkDataSet.cpp (modified) (3 diffs)
• RpVtkDataSet.h (modified) (2 diffs)
• RpVtkRenderer.cpp (modified) (5 diffs)
• RpVtkRenderer.h (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/RpContour2D.cpp

@@ -59 +59 @@
         _contourActor->GetProperty()->SetLineWidth(_edgeWidth);
         _contourActor->GetProperty()->SetOpacity(_opacity);
+        _contourActor->GetProperty()->LightingOff();
     }
 }
@@ -76 +77 @@
     vtkSmartPointer<vtkContourFilter> contourFilter = vtkSmartPointer<vtkContourFilter>::New();
     contourFilter->SetInput(_dataSet->getVtkDataSet());
+
+    contourFilter->ComputeNormalsOff();
+    contourFilter->ComputeGradientsOff();
 
     // Speed up multiple contour computation at cost of extra memory use
@@ -193 +197 @@
 {
     if (_contourMapper != NULL) {
-        if (planes == NULL)
-            _contourMapper->RemoveAllClippingPlanes();
-        else
-            _contourMapper->SetClippingPlanes(planes);
+        _contourMapper->SetClippingPlanes(planes);
     }
 }

trunk/packages/vizservers/vtkvis/RpPolyData.cpp

@@ -201 +201 @@
 {
     if (_pdMapper != NULL) {
-        if (planes == NULL)
-            _pdMapper->RemoveAllClippingPlanes();
-        else
-            _pdMapper->SetClippingPlanes(planes);
+        _pdMapper->SetClippingPlanes(planes);
     }
 }

trunk/packages/vizservers/vtkvis/RpPseudoColor.cpp

@@ -149 +149 @@
     }
     if (_dsMapper != NULL) {
+        _dsMapper->UseLookupTableScalarRangeOn();
         _dsMapper->SetLookupTable(_lut);
-        if (_dataSet != NULL) {
-            _dsMapper->SetScalarRange(dataRange);
-        }
     }
 }
@@ -230 +228 @@
 {
     if (_dsMapper != NULL) {
-        if (planes == NULL)
-            _dsMapper->RemoveAllClippingPlanes();
-        else
-            _dsMapper->SetClippingPlanes(planes);
+        _dsMapper->SetClippingPlanes(planes);
     }
 }

trunk/packages/vizservers/vtkvis/RpVtkDataSet.cpp

@@ -69 +69 @@
 
 /**
+ * \brief Read dataset using supplied reader
+ */
+bool DataSet::setData(vtkDataSet *ds)
+{
+    _dataSet = ds;
+    _dataSet->Update();
+    _dataSet->GetScalarRange(_dataRange);
+
+    TRACE("Scalar Range: %.12e, %.12e", _dataRange[0], _dataRange[1]);
+    return true;
+}
+
+/**
  * \brief Get the name/id of this dataset
  */
@@ -97 +110 @@
  *
  * Note: no interpolation is performed on data
+ *
+ * \return the value of the nearest point or 0 if no scalar data available
  */
 double DataSet::getDataValue(double x, double y, double z)
@@ -102 +117 @@
     if (_dataSet == NULL)
         return 0;
+    if (_dataSet->GetPointData() == NULL ||
+        _dataSet->GetPointData()->GetScalars() == NULL) {
+        return 0.0;
+    }
     vtkIdType pt = _dataSet->FindPoint(x, y, z);
     return _dataSet->GetPointData()->GetScalars()->GetComponent(pt, 0);

trunk/packages/vizservers/vtkvis/RpVtkDataSet.h

@@ -29 +29 @@
     bool setData(char *data, int nbytes);
 
+    bool setData(vtkDataSet *ds);
+
+    bool setData(vtkDataSetReader *reader);
+
     bool setDataFile(const char *filename);
 
@@ -42 +46 @@
     DataSet();
 
-    bool setData(vtkDataSetReader *reader);
-
     std::string _name;
     vtkSmartPointer<vtkDataSet> _dataSet;

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -217 +217 @@
         TRACE("After deleting graphics objects");
 
+        // Update cumulative data range
+        collectDataRanges(_cumulativeDataRange);
+
         delete itr->second;
         _dataSets.erase(itr);
@@ -265 +268 @@
         _needsRedraw = true;
         return ds->setData(data, nbytes);
+        collectDataRanges(_cumulativeDataRange);
     } else
         return false;
@@ -1291 +1295 @@
 }
 
+/**
+ * \brief Collect cumulative data range of all DataSets
+ *
+ * \param[inout] range Data range of all DataSets
+ */
+void Renderer::collectDataRanges(double *range)
+{
+    range[0] = DBL_MAX;
+    range[1] = -DBL_MAX;
+
+    for (DataSetHashmap::iterator itr = _dataSets.begin();
+         itr != _dataSets.end(); ++itr) {
+        double r[2];
+        itr->second->getDataRange(r);
+        range[0] = min2(range[0], r[0]);
+        range[1] = max2(range[1], r[1]);
+    }
+    if (range[0] == DBL_MAX)
+        range[0] = 0;
+    if (range[1] == -DBL_MAX)
+        range[1] = 1;
+}
+
 #ifdef notdef
 void Renderer::setPerspectiveCameraByBounds(double bounds[6])
@@ -1404 +1431 @@
                 itr->second->setClippingPlanes(_clippingPlanes);
             }
+            for (PolyDataHashmap::iterator itr = _polyDatas.begin();
+                 itr != _polyDatas.end(); ++itr) {
+                itr->second->setClippingPlanes(_clippingPlanes);
+            }
         } else {
             for (PseudoColorHashmap::iterator itr = _pseudoColors.begin();
@@ -1413 +1444 @@
                 itr->second->setClippingPlanes(NULL);
             }
+            for (PolyDataHashmap::iterator itr = _polyDatas.begin();
+                 itr != _polyDatas.end(); ++itr) {
+                itr->second->setClippingPlanes(NULL);
+            }
         }
         _renderWindow->Render();

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -220 +220 @@
     void collectBounds(double *bounds, bool onlyVisible);
 
+    void collectDataRanges(double *range);
+
     void storeCameraOrientation();
     void restoreCameraOrientation();
@@ -234 +236 @@
     double _cameraUp[3];
     float _bgColor[3];
+    double _cumulativeDataRange[2];
 
     ColorMapHashmap _colorMaps;