Changeset 2146

Timestamp:

Mar 24, 2011, 9:41:10 AM (14 years ago)

Author:

ldelgass

Message:

Checkpoint commit of cumulative range support for VTK viz. server

Location:

trunk/packages/vizservers/vtkvis

Files:

• RpPseudoColor.cpp (modified) (1 diff)
• RpVtkRenderer.cpp (modified) (9 diffs)
• RpVtkRenderer.h (modified) (3 diffs)
• RpVtkRendererCmd.cpp (modified) (2 diffs)
• protocol.txt (modified) (1 diff)

trunk/packages/vizservers/vtkvis/RpPseudoColor.cpp

@@ -95 +95 @@
     _lut->SetRange(dataRange);
 
+    _dsMapper->UseLookupTableScalarRangeOn();
     _dsMapper->SetLookupTable(_lut);
-    _dsMapper->SetScalarRange(dataRange);
-    //_dsMapper->GetLookupTable()->SetRange(dataRange);
     //_dsMapper->InterpolateScalarsBeforeMappingOn();
 
     initActor();
     _dsActor->SetMapper(_dsMapper);
-    //_dsActor->GetProperty()->SetRepresentationToWireframe();
 }
 

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -38 +38 @@
     _needsRedraw(true),
     _windowWidth(320),
-    _windowHeight(320)
+    _windowHeight(320),
+    _useCumulativeRanges(true)
 {
     _bgColor[0] = 0;
@@ -48 +49 @@
     _clippingPlanes = vtkSmartPointer<vtkPlaneCollection>::New();
     // bottom
-    vtkPlane *plane0 = vtkPlane::New();
+    vtkSmartPointer<vtkPlane> plane0 = vtkSmartPointer<vtkPlane>::New();
     plane0->SetNormal(0, 1, 0);
     plane0->SetOrigin(0, 0, 0);
     _clippingPlanes->AddItem(plane0);
     // left
-    vtkPlane *plane1 = vtkPlane::New();
+    vtkSmartPointer<vtkPlane> plane1 = vtkSmartPointer<vtkPlane>::New();
     plane1->SetNormal(1, 0, 0);
     plane1->SetOrigin(0, 0, 0);
     _clippingPlanes->AddItem(plane1);
    // top
-    vtkPlane *plane2 = vtkPlane::New();
+    vtkSmartPointer<vtkPlane> plane2 = vtkSmartPointer<vtkPlane>::New();
     plane2->SetNormal(0, -1, 0);
     plane2->SetOrigin(0, 1, 0);
     _clippingPlanes->AddItem(plane2);
     // right
-    vtkPlane *plane3 = vtkPlane::New();
+    vtkSmartPointer<vtkPlane> plane3 = vtkSmartPointer<vtkPlane>::New();
     plane3->SetNormal(-1, 0, 0);
     plane3->SetOrigin(1, 0, 0);
@@ -300 +301 @@
     if (ds) {
         bool ret = ds->setDataFile(filename);
-        PseudoColor *ps = getPseudoColor(id);
-        if (ps) {
-            ps->setDataSet(ds);
-        }
+        collectDataRanges(_cumulativeDataRange);
+        updateRanges(_useCumulativeRanges);
         _needsRedraw = true;
         return ret;
@@ -317 +316 @@
     DataSet *ds = getDataSet(id);
     if (ds) {
+        bool ret = ds->setData(data, nbytes);
+        collectDataRanges(_cumulativeDataRange);
+        updateRanges(_useCumulativeRanges);
         _needsRedraw = true;
-        return ds->setData(data, nbytes);
-        collectDataRanges(_cumulativeDataRange);
+        return ret;
     } else
         return false;
@@ -628 +629 @@
 
     do {
+        TRACE("Deleting ColorMap %s", itr->second->getName().c_str());
+
         // TODO: Check if color map is used in PseudoColors?
         delete itr->second;
@@ -640 +643 @@
  * returned if the color map is not found
  */
-bool Renderer::renderColorMap(const ColorMapId& id, const char *title,
+bool Renderer::renderColorMap(const ColorMapId& id, 
+                              const DataSetId& dataSetID,
+                              const char *title,
                               int width, int height,
                               vtkUnsignedCharArray *imgData)
@@ -667 +672 @@
         _legendRenderer->AddActor(_scalarBarActor);
     }
-    _scalarBarActor->SetLookupTable(colorMap->getLookupTable());
+
+    vtkSmartPointer<vtkLookupTable> lut = colorMap->getLookupTable();
+    if (dataSetID.compare("all") == 0) {
+        lut->SetRange(_cumulativeDataRange);
+    } else {
+        DataSet *dataSet = getDataSet(dataSetID);
+        if (dataSet == NULL) {
+            lut->SetRange(_cumulativeDataRange);
+        } else {
+            double range[2];
+            dataSet->getDataRange(range);
+            lut->SetRange(range);
+        }
+    }
+    _scalarBarActor->SetLookupTable(lut);
+
     // Set viewport-relative width/height/pos
     if (width > height) {
@@ -776 +796 @@
               itr->second->getDataSet()->getName().c_str());
 
-        itr->second->setLookupTable(cmap->getLookupTable());
+        // Make a copy of the generic colormap lookup table, so 
+        // data range can be set in the copy table to match the 
+        // dataset being plotted
+        vtkSmartPointer<vtkLookupTable> lut = vtkSmartPointer<vtkLookupTable>::New();
+        lut->DeepCopy(cmap->getLookupTable());
+
+        itr->second->setLookupTable(lut);
     } while (doAll && ++itr != _pseudoColors.end());
 
@@ -1778 +1804 @@
             if (bounds[i] == -DBL_MAX)
                 bounds[i] = 1;
+        }
+    }
+}
+
+/**
+ * \brief Update data ranges for color-mapping
+ *
+ * \param[in] useCumulative Use cumulative range of all DataSets
+ */
+void Renderer::updateRanges(bool useCumulative)
+{
+    for (PseudoColorHashmap::iterator itr = _pseudoColors.begin();
+         itr != _pseudoColors.end(); ++itr) {
+        vtkLookupTable *lut = itr->second->getLookupTable();
+        if (lut) {
+            if (useCumulative) {
+                lut->SetRange(_cumulativeDataRange);
+            } else {
+                double range[2];
+                if (itr->second->getDataSet()) {
+                    itr->second->getDataSet()->getDataRange(range);
+                    lut->SetRange(range);
+                }
+            }
         }
     }

trunk/packages/vizservers/vtkvis/RpVtkRenderer.h

@@ -138 +138 @@
     ColorMap *getColorMap(const ColorMapId& id);
 
-    bool renderColorMap(const ColorMapId& id, const char *title,
+    bool renderColorMap(const ColorMapId& id, 
+                        const DataSetId& dataSetID,
+                        const char *title,
                         int width, int height,
                         vtkUnsignedCharArray *imgData);
@@ -228 +230 @@
     void collectDataRanges(double *range);
 
+    void updateRanges(bool useCumulative);
+
     void storeCameraOrientation();
     void restoreCameraOrientation();
@@ -242 +246 @@
     double _cameraUp[3];
     float _bgColor[3];
+    bool _useCumulativeRanges;
     double _cumulativeDataRange[2];
 

trunk/packages/vizservers/vtkvis/RpVtkRendererCmd.cpp

@@ -827 +827 @@
     if (objc < 4) {
         Tcl_AppendResult(interp, "wrong # args: should be \"",
-                Tcl_GetString(objv[0]), " colormapName title width height\"", (char*)NULL);
+                Tcl_GetString(objv[0]), " colormapName title width height ?dataSetName?\"", (char*)NULL);
         return TCL_ERROR;
     }
@@ -842 +842 @@
         vtkSmartPointer<vtkUnsignedCharArray>::New();
 
-    if (!g_renderer->renderColorMap(name, title, width, height, imgData)) {
-        Tcl_AppendResult(interp, "Color map \"",
-                name, "\" was not found", (char*)NULL);
-        return TCL_ERROR;
+    if (objc == 6) {
+        const char *dataSetName = Tcl_GetString(objv[5]);
+        if (!g_renderer->renderColorMap(name, dataSetName, title, width, height, imgData)) {
+            Tcl_AppendResult(interp, "Color map \"",
+                             name, "\" was not found", (char*)NULL);
+            return TCL_ERROR;
+        }
+    } else {
+        if (!g_renderer->renderColorMap(name, "all", title, width, height, imgData)) {
+            Tcl_AppendResult(interp, "Color map \"",
+                             name, "\" was not found", (char*)NULL);
+            return TCL_ERROR;
+        }
     }
 

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -36 +36 @@
 colormap delete <?colorMapName?>
 
-legend <colormapName> <legendTitle> <width> <height>
+legend <colormapName> <legendTitle> <width> <height> <?datasetName?>
        Causes legend to be rendered and written back with labels and title