Changeset 3682

Timestamp:

Jun 10, 2013 12:21:22 AM (10 years ago)

Author:

ldelgass

Message:

Streamlines:

• Set a default max. of 500 seeds for points of a mesh and make 'streamlines seed numpts' set the max when using this seed type (setting a numpts < 0 will give the previous behavior of using all points of the mesh).
• Add point size option for seeds.
• Add protocol for setting streamlines terminal speed.
• NOTE: Streamlines on 2D meshes seem to only work if there is no plane offset

LIC:

• Add support for clouds by meshing before resampling to an image.

Location:

trunk/packages/vizservers/vtkvis

Files:

• DataSet.cpp (modified) (5 diffs)
• LIC.cpp (modified) (6 diffs)
• Renderer.h (modified) (3 diffs)
• RendererCmd.cpp (modified) (4 diffs)
• RendererGraphicsObjs.cpp (modified) (5 diffs)
• Streamlines.cpp (modified) (9 diffs)
• Streamlines.h (modified) (2 diffs)
• protocol.txt (modified) (1 diff)

trunk/packages/vizservers/vtkvis/DataSet.cpp

@@ -185 +185 @@
             }
         }
+        if (ds->GetPointData()->GetScalars() != NULL) {
+            TRACE("Active point scalars: %s", ds->GetPointData()->GetScalars()->GetName());
+        }
+        if (ds->GetPointData()->GetVectors() != NULL) {
+            TRACE("Active point vectors: %s", ds->GetPointData()->GetVectors()->GetName());
+        }
     }
     if (ds->GetCellData() != NULL) {
@@ -200 +206 @@
                       ds->GetCellData()->GetAbstractArray(i)->GetNumberOfComponents());
             }
+        }
+        if (ds->GetCellData()->GetScalars() != NULL) {
+            TRACE("Active cell scalars: %s", ds->GetPointData()->GetScalars()->GetName());
+        }
+        if (ds->GetCellData()->GetVectors() != NULL) {
+            TRACE("Active cell vectors: %s", ds->GetPointData()->GetVectors()->GetName());
         }
     }
@@ -407 +419 @@
     getBounds(bounds);
     if (bounds[4] == bounds[5]) {
-        // Z = 0, XY plane
+        // Zmin = Zmax, XY plane
         if (plane != NULL) {
             *plane = PLANE_XY;
@@ -415 +427 @@
         return true;
     } else if (bounds[0] == bounds[1]) {
-        // X = 0, ZY plane
+        // Xmin = Xmax, ZY plane
         if (plane != NULL) {
             *plane = PLANE_ZY;
@@ -423 +435 @@
         return true;
     } else if (bounds[2] == bounds[3]) {
-        // Y = 0, XZ plane
+        // Ymin = Ymax, XZ plane
         if (plane != NULL) {
             *plane = PLANE_XZ;

trunk/packages/vizservers/vtkvis/LIC.cpp

@@ -21 +21 @@
 #include <vtkImageMask.h>
 #include <vtkImageCast.h>
+#include <vtkDelaunay2D.h>
+#include <vtkDelaunay3D.h>
+#include <vtkTransform.h>
 
 #include "LIC.h"
@@ -109 +112 @@
             _lic->SetInputConnection(_volumeSlicer->GetOutputPort());
         } else {
-            // 2D image/volume/uniform grid
+            // 2D image/uniform grid
 #ifdef USE_VTK6
             _lic->SetInputData(ds);
@@ -120 +123 @@
         }
         _mapper->SetInputConnection(_lic->GetOutputPort());
-    } else if (vtkPolyData::SafeDownCast(ds) == NULL) {
-        // structured grid, unstructured grid, or rectilinear grid
+    } else if (vtkPolyData::SafeDownCast(ds) == NULL ||
+               _dataSet->isCloud() ||
+               _dataSet->is2D()) {
+        // structured/rectilinear/unstructured grid, cloud or 2D polydata
         if (_lic == NULL) {
             _lic = vtkSmartPointer<vtkImageDataLIC2D>::New();
@@ -140 +145 @@
             _probeFilter = vtkSmartPointer<vtkProbeFilter>::New();
 
-        if (!_dataSet->is2D()) {
-            // Sample a plane within the grid bounding box
+        PrincipalPlane plane;
+        double offset;
+        if (!_dataSet->is2D(&plane, &offset)) {
+            // 3D Data: Sample a plane within the bounding box
             vtkSmartPointer<vtkCutter> cutter = vtkSmartPointer<vtkCutter>::New();
             if (_cutPlane == NULL) {
@@ -162 +169 @@
                                      bounds[4] + (bounds[5]-bounds[4])/2.);
             }
-#ifdef USE_VTK6
-            cutter->SetInputData(ds);
-#else
-            cutter->SetInput(ds);
-#endif
+
+            if (_dataSet->isCloud()) {
+                // 3D cloud -- Need to mesh it before we can resample
+                vtkSmartPointer<vtkDelaunay3D> mesher = vtkSmartPointer<vtkDelaunay3D>::New();
+#ifdef USE_VTK6
+                mesher->SetInputData(ds);
+#else
+                mesher->SetInput(ds);
+#endif
+                cutter->SetInputConnection(mesher->GetOutputPort());
+            } else {
+#ifdef USE_VTK6
+                cutter->SetInputData(ds);
+#else
+                cutter->SetInput(ds);
+#endif
+            }
             cutter->SetCutFunction(_cutPlane);
             _probeFilter->SetSourceConnection(cutter->GetOutputPort());
         } else {
-#ifdef USE_VTK6
-            _probeFilter->SetSourceData(ds);
-#else
-            _probeFilter->SetSource(ds);
-#endif
+            if (_dataSet->isCloud()) {
+                // 2D cloud -- Need to mesh it before we can resample
+                vtkSmartPointer<vtkDelaunay2D> mesher = vtkSmartPointer<vtkDelaunay2D>::New();
+                if (plane == PLANE_ZY) {
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->RotateWXYZ(90, 0, 1, 0);
+                    if (offset != 0.0) {
+                        trans->Translate(-offset, 0, 0);
+                    }
+                    mesher->SetTransform(trans);
+                } else if (plane == PLANE_XZ) {
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->RotateWXYZ(-90, 1, 0, 0);
+                    if (offset != 0.0) {
+                        trans->Translate(0, -offset, 0);
+                    }
+                    mesher->SetTransform(trans);
+                } else if (offset != 0.0) {
+                    // XY with Z offset
+                    vtkSmartPointer<vtkTransform> trans = vtkSmartPointer<vtkTransform>::New();
+                    trans->Translate(0, 0, -offset);
+                    mesher->SetTransform(trans);
+                }
+#ifdef USE_VTK6
+                mesher->SetInputData(ds);
+#else
+                mesher->SetInput(ds);
+#endif
+                _probeFilter->SetSourceConnection(mesher->GetOutputPort());
+            } else {
+#ifdef USE_VTK6
+                _probeFilter->SetSourceData(ds);
+#else
+                _probeFilter->SetSource(ds);
+#endif
+            }
         }
 
@@ -239 +289 @@
         _mapper->SetInputConnection(mask->GetOutputPort());
     } else {
-        // DataSet is a PolyData
+        // DataSet is a 3D PolyData with cells
         vtkPolyData *pd = vtkPolyData::SafeDownCast(ds);
         assert(pd != NULL);

trunk/packages/vizservers/vtkvis/Renderer.h

@@ -762 +762 @@
     // Streamlines
 
+    void setStreamlinesColorMode(const DataSetId& id,
+                                 Streamlines::ColorMode mode,
+                                 const char *name, double range[2] = NULL);
+
+    void setStreamlinesColorMode(const DataSetId& id,
+                                 Streamlines::ColorMode mode,
+                                 DataSet::DataAttributeType type,
+                                 const char *name, double range[2] = NULL);
+
+    void setStreamlinesLength(const DataSetId& id, double length);
+
     void setStreamlinesNumberOfSeedPoints(const DataSetId& id, int numPoints);
 
-    void setStreamlinesSeedToMeshPoints(const DataSetId& id);
+    void setStreamlinesSeedColor(const DataSetId& id, float color[3]);
+
+    void setStreamlinesSeedPointSize(const DataSetId& id, float size);
+
+    void setStreamlinesSeedToMeshPoints(const DataSetId& id,
+                                        int maxPoints = 500);
 
     void setStreamlinesSeedToFilledMesh(const DataSetId& id, int numPoints);
 
     bool setStreamlinesSeedToMeshPoints(const DataSetId& id,
-                                        char *data, size_t nbytes);
+                                        char *data, size_t nbytes,
+                                        int maxPoints = 500);
 
     bool setStreamlinesSeedToFilledMesh(const DataSetId& id,
@@ -794 +811 @@
                                            int numSides, int numPoints);
 
-    void setStreamlinesLength(const DataSetId& id, double length);
+    void setStreamlinesSeedVisibility(const DataSetId& id, bool state);
+
+    void setStreamlinesTerminalSpeed(const DataSetId& id, double speed);
 
     void setStreamlinesTypeToLines(const DataSetId& id);
@@ -801 +820 @@
 
     void setStreamlinesTypeToRibbons(const DataSetId& id, double width, double angle);
-
-    void setStreamlinesSeedVisibility(const DataSetId& id, bool state);
-
-    void setStreamlinesColorMode(const DataSetId& id,
-                                 Streamlines::ColorMode mode,
-                                 const char *name, double range[2] = NULL);
-
-    void setStreamlinesColorMode(const DataSetId& id,
-                                 Streamlines::ColorMode mode,
-                                 DataSet::DataAttributeType type,
-                                 const char *name, double range[2] = NULL);
-
-    void setStreamlinesSeedColor(const DataSetId& id, float color[3]);
 
     // Volumes

trunk/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -9348 +9348 @@
 
 static int
+StreamlinesSeedPointSizeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                           Tcl_Obj *const *objv)
+{
+    float size;
+    if (GetFloatFromObj(interp, objv[3], &size) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 5) {
+        const char *name = Tcl_GetString(objv[4]);
+        g_renderer->setStreamlinesSeedPointSize(name, size);
+    } else {
+        g_renderer->setStreamlinesSeedPointSize("all", size);
+    }
+    return TCL_OK;
+}
+
+static int
 StreamlinesSeedRakeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                       Tcl_Obj *const *objv)
@@ -9416 +9433 @@
     {"points",  3, StreamlinesSeedPointsOp,        3, 4, "?dataSetName?"},
     {"polygon", 3, StreamlinesSeedPolygonOp,       12, 13, "centerX centerY centerZ normalX normalY normalZ angle radius numSides ?dataSetName?"},
+    {"ptsize",  2, StreamlinesSeedPointSizeOp,     3, 4, "size ?dataSetName?"},
     {"rake",    3, StreamlinesSeedRakeOp,          10, 11, "startX startY startZ endX endY endZ numPoints ?dataSetName?"},
     {"random",  3, StreamlinesSeedRandomOp,        4, 5, "numPoints ?dataSetName?"},
@@ -9434 +9452 @@
     }
     return (*proc) (clientData, interp, objc, objv);
+}
+
+static int
+StreamlinesTerminalSpeedOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                           Tcl_Obj *const *objv)
+{
+    double speed;
+    if (Tcl_GetDoubleFromObj(interp, objv[2], &speed) != TCL_OK) {
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *name = Tcl_GetString(objv[3]);
+        g_renderer->setStreamlinesTerminalSpeed(name, speed);
+    } else {
+        g_renderer->setStreamlinesTerminalSpeed("all", speed);
+    }
+    return TCL_OK;
 }
 
@@ -9492 +9527 @@
     {"scale",        2, StreamlinesScaleOp,          5, 6, "sx sy sz ?dataSetName?"},
     {"seed",         2, StreamlinesSeedOp,           3, 14, "op params... ?dataSetName?"},
-    {"tubes",        1, StreamlinesTubesOp,          4, 5, "numSides radius ?dataSetName?"},
+    {"termspeed",    2, StreamlinesTerminalSpeedOp,  3, 4, "speed ?dataSetName?"},
+    {"tubes",        2, StreamlinesTubesOp,          4, 5, "numSides radius ?dataSetName?"},
     {"visible",      1, StreamlinesVisibleOp,        3, 4, "bool ?dataSetName?"}
 };

trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp

@@ -2537 +2537 @@
 
 /**
- * \brief Set the streamlines seed to points of the streamlines DataSet
- */
-void Renderer::setStreamlinesSeedToMeshPoints(const DataSetId& id)
+ * \brief Set the streamlines seed point size (may be a no-op)
+ */
+void Renderer::setStreamlinesSeedPointSize(const DataSetId& id, float size)
 {
     StreamlinesHashmap::iterator itr;
@@ -2559 +2559 @@
 
     do {
-        itr->second->setSeedToMeshPoints();
+        itr->second->setSeedPointSize(size);
+    } while (doAll && ++itr != _streamlines.end());
+
+    _needsRedraw = true;
+}
+
+/**
+ * \brief Set the streamlines seed to points of the streamlines DataSet
+ */
+void Renderer::setStreamlinesSeedToMeshPoints(const DataSetId& id,
+                                              int maxPoints)
+{
+    StreamlinesHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _streamlines.begin();
+        if (itr == _streamlines.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _streamlines.find(id);
+    }
+    if (itr == _streamlines.end()) {
+        ERROR("Streamlines not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setSeedToMeshPoints(maxPoints);
     } while (doAll && ++itr != _streamlines.end());
 
@@ -2607 +2637 @@
  */
 bool Renderer::setStreamlinesSeedToMeshPoints(const DataSetId& id,
-                                              char *data, size_t nbytes)
+                                              char *data, size_t nbytes,
+                                              int maxPoints)
 {
     vtkSmartPointer<vtkDataSetReader> reader = vtkSmartPointer<vtkDataSetReader>::New();
@@ -2640 +2671 @@
 
     do {
-        itr->second->setSeedToMeshPoints(dataSet);
+        itr->second->setSeedToMeshPoints(dataSet, maxPoints);
     } while (doAll && ++itr != _streamlines.end());
 
@@ -2836 +2867 @@
 }
 
+void Renderer::setStreamlinesTerminalSpeed(const DataSetId& id, double speed)
+{
+    StreamlinesHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _streamlines.begin();
+        if (itr == _streamlines.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _streamlines.find(id);
+    }
+    if (itr == _streamlines.end()) {
+        ERROR("Streamlines not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setTerminalSpeed(speed);
+    } while (doAll && ++itr != _streamlines.end());
+
+    sceneBoundsChanged();
+    _needsRedraw = true;
+}
+
 /**
  * \brief Set Streamlines rendering to polylines for the specified DataSet

trunk/packages/vizservers/vtkvis/Streamlines.cpp

@@ -32 +32 @@
 #include <vtkTransformPolyDataFilter.h>
 #include <vtkVertexGlyphFilter.h>
+#include <vtkMaskPoints.h>
 
 #include "Streamlines.h"
@@ -611 +612 @@
     _streamTracer->Update();
     vtkPolyData *pd = _streamTracer->GetOutput();
-    TRACE("Verts: %d Lines: %d Polys: %d Strips: %d",
+    DataSet::print(pd);
+    TRACE("Points: %d Verts: %d Lines: %d Polys: %d Strips: %d",
+          pd->GetNumberOfPoints(),
           pd->GetNumberOfVerts(),
           pd->GetNumberOfLines(),
           pd->GetNumberOfPolys(),
           pd->GetNumberOfStrips());
+#if 0
     vtkCellArray *arr = pd->GetLines();
     arr->InitTraversal();
@@ -624 +628 @@
     }
 #endif
+#endif
 
     initProp();
@@ -657 +662 @@
         }
         break;
+    case DATASET_MESH_POINTS:
+        setSeedToMeshPoints(numPoints);
+        break;
+    case MESH_POINTS:
+        setSeedToMeshPoints(_seedMesh, numPoints);
+        break;
     default:
         ERROR("Can't set number of points for seed type %d", _seedType);
@@ -669 +680 @@
  * Streamlines as seeds
  */
-void Streamlines::setSeedToMeshPoints()
+void Streamlines::setSeedToMeshPoints(int maxPoints)
 {
     _seedType = DATASET_MESH_POINTS;
-    setSeedToMeshPoints(_dataSet->getVtkDataSet());
+    setSeedToMeshPoints(_dataSet->getVtkDataSet(), maxPoints);
 }
 
@@ -696 +707 @@
  * \param[in] seed vtkDataSet with points to use as seeds
  */
-void Streamlines::setSeedToMeshPoints(vtkDataSet *seed)
+void Streamlines::setSeedToMeshPoints(vtkDataSet *seed, int maxPoints)
 {
     if (seed != _dataSet->getVtkDataSet()) {
         _seedType = MESH_POINTS;
-    }
-    _seedMesh = NULL;
-    if (_streamTracer != NULL) {
+        _seedMesh = seed;
+    } else {
+        _seedType = DATASET_MESH_POINTS;
+        _seedMesh = NULL;
+    }
+
+    if (_streamTracer == NULL)
+        return;
+
+#ifndef USE_VTK6
+    vtkSmartPointer<vtkDataSet> oldSeed;
+    if (_streamTracer->GetSource() != NULL) {
+        oldSeed = _streamTracer->GetSource();
+    }
+#endif
+
+    if (maxPoints > 0 && seed->GetNumberOfPoints() > maxPoints) {
+        TRACE("Seed points: %d", maxPoints);
+        vtkSmartPointer<vtkMaskPoints> mask = vtkSmartPointer<vtkMaskPoints>::New();
+#ifdef USE_VTK6
+        mask->SetInputData(seed);
+#else
+        mask->SetInput(seed);
+#endif
+        mask->SetMaximumNumberOfPoints(maxPoints);
+        mask->RandomModeOn();
+        mask->GenerateVerticesOff();
+        _streamTracer->SetSourceConnection(mask->GetOutputPort());
+
+        vtkSmartPointer<vtkVertexGlyphFilter> vertFilter = vtkSmartPointer<vtkVertexGlyphFilter>::New();
+        vertFilter->SetInputConnection(mask->GetOutputPort());
+        _seedMapper->SetInputConnection(vertFilter->GetOutputPort());
+    } else {
         TRACE("Seed points: %d", seed->GetNumberOfPoints());
-        vtkSmartPointer<vtkDataSet> oldSeed;
-        if (_streamTracer->GetSource() != NULL) {
-            oldSeed = _streamTracer->GetSource();
-        }
 
 #ifdef USE_VTK6
@@ -713 +750 @@
 #else
         _streamTracer->SetSource(seed);
-
-        if (oldSeed != NULL) {
-            oldSeed->SetPipelineInformation(NULL);
-        }
 #endif
         if (vtkPolyData::SafeDownCast(seed) != NULL) {
@@ -734 +767 @@
         }
     }
+
+#ifndef USE_VTK6
+    if (oldSeed != NULL) {
+        oldSeed->SetPipelineInformation(NULL);
+    }
+#endif
 }
 
@@ -1767 +1806 @@
 
 /**
+ * \brief Set point size of seed geometry (may be a no-op)
+ */
+void Streamlines::setSeedPointSize(float size)
+{
+    if (_seedActor != NULL) {
+        _seedActor->GetProperty()->SetPointSize(size);
+    }
+}
+
+/**
  * \brief Set pixel width of stream lines (may be a no-op)
  */

trunk/packages/vizservers/vtkvis/Streamlines.h

@@ -100 +100 @@
     void setNumberOfSeedPoints(int numPoints);
 
-    void setSeedToMeshPoints();
+    void setSeedToMeshPoints(int maxPoints = 500);
 
     void setSeedToFilledMesh(int numPoints);
 
-    void setSeedToMeshPoints(vtkDataSet *ds);
+    void setSeedToMeshPoints(vtkDataSet *ds, int maxPoints = 500);
 
     void setSeedToFilledMesh(vtkDataSet *ds, int numPoints);
@@ -172 +172 @@
 
     void setSeedColor(float color[3]);
+
+    void setSeedPointSize(float size);
 
 private:

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -728 +728 @@
             Use points of a mesh supplied as a VTK data file
 streamlines seed numpts <?datasetName?>
-            If seeds have been created using 'seed random' or 'seed fmesh', 
-            this command can be used to change the number of randomly 
-            distributed seeds
+            If seeds have been created using 'seed random', 'seed fmesh',
+            'seed mesh' or 'seed points' this command can be used to change the 
+            number of randomly distributed seeds.  In the case of 'seed mesh'
+            or 'seed points', the number is the maximum number of points of the 
+            mesh to be used -- the actual number may be fewer if the mesh
+            contains fewer points.  Set to a number less than 0 to use all the
+            points of the mesh.
 streamlines seed points <?datasetName?>
             Use points of the streamlines' dataset mesh
 streamlines seed polygon <centerX> <centerY> <centerZ> <normalX> <normalY> <normalZ> <angle> <radius> <numSides> <?dataSetName?>
             Create seed points from vertices of a regular n-sided polygon
+streamlines seed ptsize <size> <?datasetName?>
+            Set the point size for rendering seed points
 streamlines seed rake <startX> <startY> <startZ> <endX> <endY> <endZ> <numPoints> <?datasetName?>
 streamlines seed random <numPoints> <?datasetName?>