Changeset 2454 for trunk

Timestamp:

Aug 31, 2011, 3:52:05 PM (13 years ago)

Author:

ldelgass

Message:

Apply a scaling heuristic to streamline tubes and ribbons based on cell sizes.
Protocol scale values are now relative. Also cache cell size info in
DataSet? class.

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpStreamlines.cpp (modified) (4 diffs)
• RpStreamlines.h (modified) (1 diff)
• RpVtkDataSet.cpp (modified) (9 diffs)
• RpVtkDataSet.h (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/RpStreamlines.cpp

@@ -37 +37 @@
     _colorMode(COLOR_BY_VECTOR_MAGNITUDE),
     _colorMap(NULL),
-    _seedVisible(true)
+    _seedVisible(true),
+    _dataScale(1)
 {
     _faceCulling = true;
@@ -246 +247 @@
     }
 
+    double cellSizeRange[2];
+    double avgSize;
+    _dataSet->getCellSizeRange(cellSizeRange, &avgSize);
+    _dataScale = avgSize / 8.;
+
     vtkSmartPointer<vtkCellDataToPointData> cellToPtData;
 
@@ -746 +752 @@
             numSides = 3;
         tubeFilter->SetNumberOfSides(numSides);
-        tubeFilter->SetRadius(radius);
+        tubeFilter->SetRadius(_dataScale * radius);
         _pdMapper->SetInputConnection(_lineFilter->GetOutputPort());
         if (_faceCulling && _opacity == 1.0)
@@ -771 +777 @@
         }
         vtkRibbonFilter *ribbonFilter = vtkRibbonFilter::SafeDownCast(_lineFilter);
-        ribbonFilter->SetWidth(width);
+        ribbonFilter->SetWidth(_dataScale * width);
         ribbonFilter->SetAngle(angle);
         ribbonFilter->UseDefaultNormalOn();

trunk/packages/vizservers/vtkvis/RpStreamlines.h

@@ -145 +145 @@
     double _vectorMagnitudeRange[2];
     double _vectorComponentRange[3][2];
+    double _dataScale;
 
     vtkSmartPointer<vtkLookupTable> _lut;

trunk/packages/vizservers/vtkvis/RpVtkDataSet.cpp

@@ -31 +31 @@
 DataSet::DataSet(const std::string& name) :
     _name(name),
-    _visible(true)
-{
+    _visible(true),
+    _cellSizeAverage(0)
+{
+    _cellSizeRange[0] = -1;
+    _cellSizeRange[1] = -1;
 }
 
@@ -80 +83 @@
     //reader->ReadAllTensorsOn();
     reader->ReadAllFieldsOn();
+
     return setData(reader);
 }
@@ -88 +92 @@
 bool DataSet::setData(char *data, int nbytes)
 {
-    TRACE("Entering");
-
     vtkSmartPointer<vtkDataSetReader> reader = vtkSmartPointer<vtkDataSetReader>::New();
     vtkSmartPointer<vtkCharArray> dataSetString = vtkSmartPointer<vtkCharArray>::New();
@@ -109 +111 @@
     reader->ReadAllFieldsOn();
 
-    bool status = setData(reader);
-
-    TRACE("Leaving");
-    return status;
+    return setData(reader);
 }
 
@@ -220 +219 @@
 bool DataSet::setData(vtkDataSetReader *reader)
 {
+    TRACE("Enter");
     // Force reading data set
     reader->SetLookupTableName("");
@@ -238 +238 @@
     print();
 #endif
+    TRACE("Leave");
     return true;
 }
@@ -515 +516 @@
  * \brief Get the range of cell AABB diagonal lengths in the DataSet
  */
-void DataSet::getCellSizeRange(double minmax[6], double *average) const
+void DataSet::getCellSizeRange(double minmax[2], double *average)
 {
     if (_dataSet == NULL ||
@@ -522 +523 @@
         minmax[1] = 1;
         *average = 1;
+        return;
+    }
+
+    if (_cellSizeRange[0] >= 0.0) {
+        minmax[0] = _cellSizeRange[0];
+        minmax[1] = _cellSizeRange[1];
+        *average = _cellSizeAverage;
         return;
     }
@@ -545 +553 @@
     minmax[1] = sqrt(minmax[1]);
     *average = sqrt(*average/((double)_dataSet->GetNumberOfCells()));
+    _cellSizeRange[0] = minmax[0];
+    _cellSizeRange[1] = minmax[1];
+    _cellSizeAverage = *average;
 }
 

trunk/packages/vizservers/vtkvis/RpVtkDataSet.h

@@ -68 +68 @@
     void getBounds(double bounds[6]) const;
 
-    void getCellSizeRange(double minmax[6], double *average) const;
+    void getCellSizeRange(double minmax[2], double *average);
 
     bool getScalarValue(double x, double y, double z, double *value) const;
@@ -87 +87 @@
     vtkSmartPointer<vtkDataSet> _dataSet;
     bool _visible;
+    double _cellSizeRange[2];
+    double _cellSizeAverage;
 };