Changeset 3961

Timestamp:

Sep 26, 2013 11:16:53 PM (10 years ago)

Author:

ldelgass

Message:

Add volume blendmode option for VTK volume renderer. Also, don't change field
active scalar if requested field not found in dataset (previously, active
scalar field would be cleared to NULL if field not found).

Location:

trunk/packages/vizservers/vtkvis

Files:

• DataSet.cpp (modified) (2 diffs)
• Image.h (modified) (1 diff)
• Renderer.h (modified) (1 diff)
• RendererCmd.cpp (modified) (2 diffs)
• RendererGraphicsObjs.cpp (modified) (1 diff)
• Volume.cpp (modified) (1 diff)
• Volume.h (modified) (2 diffs)
• protocol.txt (modified) (1 diff)

trunk/packages/vizservers/vtkvis/DataSet.cpp

@@ -392 +392 @@
     bool found = false;
     if (_dataSet != NULL) {
-        if (_dataSet->GetPointData() != NULL) {
-            if (_dataSet->GetPointData()->SetActiveScalars(name) >= 0) {
-                TRACE("Set active point data scalars to %s", name);
-                found = true;
-            }
-        }
-        if (_dataSet->GetCellData() != NULL) {
-            if (_dataSet->GetCellData()->SetActiveScalars(name) >= 0) {
-                TRACE("Set active cell data scalars to %s", name);
-                found = true;
+        if (!hasField(name)) {
+            ERROR("No field named %s in %s", name, getName().c_str());
+        } else {
+            if (_dataSet->GetPointData() != NULL) {
+                if (_dataSet->GetPointData()->SetActiveScalars(name) >= 0) {
+                    TRACE("Set active point data scalars for %s to %s", getName().c_str(), name);
+                    found = true;
+                }
+            }
+            if (_dataSet->GetCellData() != NULL) {
+                if (_dataSet->GetCellData()->SetActiveScalars(name) >= 0) {
+                    TRACE("Set active cell data scalars for %s to %s", getName().c_str(), name);
+                    found = true;
+                }
             }
         }
@@ -408 +412 @@
     if (_dataSet->GetPointData() != NULL) {
         if (_dataSet->GetPointData()->GetScalars() != NULL) {
-            TRACE("Point data scalars: %s", _dataSet->GetPointData()->GetScalars()->GetName());
+            TRACE("Point data scalars for %s: %s", getName().c_str(), _dataSet->GetPointData()->GetScalars()->GetName());
         } else {
-            TRACE("NULL point data scalars");
+            TRACE("NULL point data scalars for %s", getName().c_str());
         }
     }
     if (_dataSet->GetCellData() != NULL) {
         if (_dataSet->GetCellData()->GetScalars() != NULL) {
-            TRACE("Cell data scalars: %s", _dataSet->GetCellData()->GetScalars()->GetName());
+            TRACE("Cell data scalars for %s: %s", getName().c_str(), _dataSet->GetCellData()->GetScalars()->GetName());
         } else {
-            TRACE("NULL cell data scalars");
+            TRACE("NULL cell data scalars for %s", getName().c_str());
         }
     }

trunk/packages/vizservers/vtkvis/Image.h

@@ -70 +70 @@
             return;
 
-        TRACE("slice # %d, (%d,%d), whole z: (%d,%d)",
+        TRACE("before slice # %d, (%d,%d), whole z: (%d,%d)",
               actor->GetSliceNumber(), actor->GetSliceNumberMin(), actor->GetSliceNumberMax(),
               actor->GetZSlice(), actor->GetWholeZMin(), actor->GetWholeZMax());
 
         actor->SetZSlice(z);
+
+        TRACE("after slice # %d, (%d,%d), whole z: (%d,%d)",
+              actor->GetSliceNumber(), actor->GetSliceNumberMin(), actor->GetSliceNumberMax(),
+              actor->GetZSlice(), actor->GetWholeZMin(), actor->GetWholeZMax());
     }
 

trunk/packages/vizservers/vtkvis/Renderer.h

@@ -940 +940 @@
     // Volumes
 
+    void setVolumeBlendMode(const DataSetId& id, Volume::BlendMode mode);
+
     void setVolumeSampleDistance(const DataSetId& id, double distance);
 

trunk/packages/vizservers/vtkvis/RendererCmd.cpp

@@ -11792 +11792 @@
 
 static int
+VolumeBlendModeOp(ClientData clientData, Tcl_Interp *interp, int objc, 
+                  Tcl_Obj *const *objv)
+{
+    Volume::BlendMode mode;
+    const char *string = Tcl_GetString(objv[2]);
+    char c = string[0];
+    if ((c == 'c') && (strcmp(string, "composite") == 0)) {
+        mode = Volume::BLEND_COMPOSITE;
+    } else if ((c == 'm') && (strcmp(string, "max_intensity") == 0)) {
+        mode = Volume::BLEND_MAX_INTENSITY;
+    } else if ((c == 'm') && (strcmp(string, "min_intensity") == 0)) {
+        mode = Volume::BLEND_MIN_INTENSITY;
+    } else if ((c == 'a') && (strcmp(string, "additive") == 0)) {
+        mode = Volume::BLEND_ADDITIVE;
+    } else {
+        Tcl_AppendResult(interp, "bad blendmode option \"", string,
+                         "\": should be copmosite, max_intensity, min_intensity,  or additive", (char*)NULL);
+        return TCL_ERROR;
+    }
+    if (objc == 4) {
+        const char *dataSetName = Tcl_GetString(objv[3]);
+        g_renderer->setVolumeBlendMode(dataSetName, mode);
+    } else {
+        g_renderer->setVolumeBlendMode("all", mode);
+    }
+    return TCL_OK;
+}
+
+static int
 VolumeColorMapOp(ClientData clientData, Tcl_Interp *interp, int objc, 
                  Tcl_Obj *const *objv)
@@ -12035 +12064 @@
 static Rappture::CmdSpec volumeOps[] = {
     {"add",          1, VolumeAddOp,        2, 3, "?dataSetName?"},
+    {"blendmode",    1, VolumeBlendModeOp,  3, 4, "blendMode ?dataSetName?"},
     {"colormap",     1, VolumeColorMapOp,   3, 4, "colorMapName ?dataSetName?"},
     {"delete",       1, VolumeDeleteOp,     2, 3, "?dataSetName?"},

trunk/packages/vizservers/vtkvis/RendererGraphicsObjs.cpp

@@ -4182 +4182 @@
 }
 
+void Renderer::setVolumeBlendMode(const DataSetId& id, Volume::BlendMode mode)
+{
+    VolumeHashmap::iterator itr;
+
+    bool doAll = false;
+
+    if (id.compare("all") == 0) {
+        itr = _volumes.begin();
+        if (itr == _volumes.end())
+            return;
+        doAll = true;
+    } else {
+        itr = _volumes.find(id);
+    }
+    if (itr == _volumes.end()) {
+        ERROR("Volume not found: %s", id.c_str());
+        return;
+    }
+
+    do {
+        itr->second->setBlendMode(mode);
+    } while (doAll && ++itr != _volumes.end());
+
+    _needsRedraw = true;
+}
+
 /**
  * \brief Set the sample rate for the volume shader

trunk/packages/vizservers/vtkvis/Volume.cpp

@@ -290 +290 @@
     }
 }
+
+/**
+ * \brief Set Volume renderer blending mode
+ */
+void Volume::setBlendMode(BlendMode mode)
+{
+    if (_volumeMapper != NULL) {
+        vtkVolumeMapper *mapper = vtkVolumeMapper::SafeDownCast(_volumeMapper);
+        if (mapper == NULL) {
+            TRACE("Mapper does not support BlendMode");
+            return;
+        }
+        switch (mode) {
+        case BLEND_COMPOSITE:
+            mapper->SetBlendModeToComposite();
+            break;
+        case BLEND_MAX_INTENSITY:
+            mapper->SetBlendModeToMaximumIntensity();
+            break;
+        case BLEND_MIN_INTENSITY:
+            mapper->SetBlendModeToMinimumIntensity();
+            break;
+        case BLEND_ADDITIVE:
+            mapper->SetBlendModeToAdditive();
+            break;
+        default:
+            ERROR("Unknown BlendMode");
+        }
+    }
+}

trunk/packages/vizservers/vtkvis/Volume.h

@@ -29 +29 @@
 public:
     enum BlendMode {
-        COMPOSITE = 0,
-        MAX_INTENSITY,
-        MIN_INTENSITY
+        BLEND_COMPOSITE = 0,
+        BLEND_MAX_INTENSITY,
+        BLEND_MIN_INTENSITY,
+        BLEND_ADDITIVE
     };
 
@@ -60 +61 @@
     void setSampleDistance(float d);
 
+    void setBlendMode(BlendMode mode);
+
 private:
     virtual void initProp();

trunk/packages/vizservers/vtkvis/protocol.txt

@@ -892 +892 @@
 
 volume add <?datasetName?>
+volume blendmode <mode> <?dataSetName?>
+       blendmode = composite|max_intensity|min_intensity|additive
 volume colormap <colorMapName> <?datasetName?>
 volume delete <?datasetName?>