Changeset 2513 for trunk/packages/vizservers

Timestamp:

Sep 15, 2011, 10:45:04 AM (13 years ago)

Author:

ldelgass

Message:

Streamlines max propagation is _always_ world coordinates -- fix the default
and add a bit of default length. New heuristic is sum of x,y,z bounds. Fix
colormapping when input dataset has only cell data.

File:

• trunk/packages/vizservers/vtkvis/RpStreamlines.cpp (modified) (9 diffs)

trunk/packages/vizservers/vtkvis/RpStreamlines.cpp

@@ -422 +422 @@
     double bounds[6];
     _dataSet->getBounds(bounds);
+    double xLen = bounds[1] - bounds[0];
+    double yLen = bounds[3] - bounds[2];
+    double zLen = bounds[5] - bounds[4];
     double maxBound = 0.0;
-    if (bounds[1] - bounds[0] > maxBound) {
-        maxBound = bounds[1] - bounds[0];
-    }
-    if (bounds[3] - bounds[2] > maxBound) {
-        maxBound = bounds[3] - bounds[2];
-    }
-    if (bounds[5] - bounds[4] > maxBound) {
-        maxBound = bounds[5] - bounds[4];
+    if (xLen > maxBound) {
+        maxBound = xLen;
+    }
+    if (yLen > maxBound) {
+        maxBound = yLen;
+    }
+    if (zLen > maxBound) {
+        maxBound = zLen;
     }
 
@@ -461 +464 @@
 
     _streamTracer->SetInput(ds);
-    _streamTracer->SetMaximumPropagation(2.0 * maxBound / avgSize);
+    _streamTracer->SetMaximumPropagation(xLen + yLen + zLen);
     _streamTracer->SetIntegratorTypeToRungeKutta45();
+
+    TRACE("Setting streamlines max length to %g", 
+          _streamTracer->GetMaximumPropagation());
 
     if (_pdMapper == NULL) {
@@ -1000 +1006 @@
  * \brief Set the step size units.  Length units are world 
  * coordinates, and cell units means steps are from cell to 
- * cell.  Default is cell units
+ * cell.  Default is cell units.
+ *
+ * Note: calling this function will not convert existing
+ * initial, minimum or maximum step value settings to the
+ * new units, so this function should be called before 
+ * setting step values.
  */
 void Streamlines::setIntegrationStepUnit(StepUnit unit)
@@ -1063 +1074 @@
 
 /**
- * \brief Set maximum length of stream lines in integration
- * step units (see setIntegrationStepUnit)
+ * \brief Set maximum length of stream lines in world
+ * coordinates
  */
 void Streamlines::setMaxPropagation(double length)
@@ -1196 +1207 @@
         return;
 
-    vtkDataSet *ds = _dataSet->getVtkDataSet();
-
     switch (mode) {
     case COLOR_BY_SCALAR: {
@@ -1210 +1219 @@
         _pdMapper->ScalarVisibilityOn();
         _pdMapper->SetScalarModeToUsePointFieldData();
-        if (ds->GetPointData() != NULL &&
-            ds->GetPointData()->GetVectors() != NULL) {
-            _pdMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
-        }
+        _pdMapper->SelectColorArray(_dataSet->getActiveVectorsName());
         if (_lut != NULL) {
             _lut->SetRange(_vectorMagnitudeRange);
@@ -1223 +1229 @@
         _pdMapper->ScalarVisibilityOn();
         _pdMapper->SetScalarModeToUsePointFieldData();
-        if (ds->GetPointData() != NULL &&
-            ds->GetPointData()->GetVectors() != NULL) {
-            _pdMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
-        }
+        _pdMapper->SelectColorArray(_dataSet->getActiveVectorsName());
         if (_lut != NULL) {
             _lut->SetRange(_vectorComponentRange[0]);
@@ -1236 +1239 @@
         _pdMapper->ScalarVisibilityOn();
         _pdMapper->SetScalarModeToUsePointFieldData();
-        if (ds->GetPointData() != NULL &&
-            ds->GetPointData()->GetVectors() != NULL) {
-            _pdMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
-        }
+        _pdMapper->SelectColorArray(_dataSet->getActiveVectorsName());
         if (_lut != NULL) {
             _lut->SetRange(_vectorComponentRange[1]);
@@ -1249 +1249 @@
         _pdMapper->ScalarVisibilityOn();
         _pdMapper->SetScalarModeToUsePointFieldData();
-        if (ds->GetPointData() != NULL &&
-            ds->GetPointData()->GetVectors() != NULL) {
-            _pdMapper->SelectColorArray(ds->GetPointData()->GetVectors()->GetName());
-        }
+        _pdMapper->SelectColorArray(_dataSet->getActiveVectorsName());
         if (_lut != NULL) {
             _lut->SetRange(_vectorComponentRange[2]);