Changeset 4609 for vtkvis/branches/1.7

Timestamp:

Aug 2, 2014 1:01:34 AM (9 years ago)

Author:

ldelgass

Message:

more fix merges

Location:

vtkvis/branches/1.7

Files:

• . (modified) (1 prop)
• RendererCmd.cpp (modified) (3 diffs)
• Volume.cpp (modified) (2 diffs)

vtkvis/branches/1.7/RendererCmd.cpp

@@ -2337 +2337 @@
         objPtr = Tcl_NewStringObj("render_start", 12);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
-        /* server */
-        objPtr = Tcl_NewStringObj("server", 6);
+        /* renderer */
+        objPtr = Tcl_NewStringObj("renderer", 8);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
         objPtr = Tcl_NewStringObj("vtkvis", 6);
@@ -2346 +2346 @@
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
         Tcl_ListObjAppendElement(interp, listObjPtr, Tcl_NewIntObj(getpid()));
-        /* machine */
-        objPtr = Tcl_NewStringObj("machine", 7);
+        /* host */
+        objPtr = Tcl_NewStringObj("host", 4);
         Tcl_ListObjAppendElement(interp, listObjPtr, objPtr);
         gethostname(buf, BUFSIZ-1);
@@ -4622 +4622 @@
     g_renderer->addDataSet(name);
     if (!g_renderer->setData(name, data, nbytes)) {
+        free(data);
+        g_renderer->deleteDataSet(name);
         USER_ERROR("Failed to load data for dataset \"%s\"", name);
-        free(data);
         return TCL_ERROR;
     }

vtkvis/branches/1.7/Volume.cpp

@@ -109 +109 @@
     if (ds->GetPointData() == NULL ||
         ds->GetPointData()->GetScalars() == NULL) {
-        WARN("No scalar point data in dataset %s", _dataSet->getName().c_str());
+        USER_ERROR("No scalar field was found in the data set");
+        return;
     }
 
@@ -354 +355 @@
 void Volume::setBlendMode(BlendMode mode)
 {
-    if (_volumeMapper != NULL) {
-        vtkVolumeMapper *mapper = vtkVolumeMapper::SafeDownCast(_volumeMapper);
-        if (mapper == NULL) {
+    if (_volumeMapper == NULL)
+        return;
+
+    vtkVolumeMapper *mapper = vtkVolumeMapper::SafeDownCast(_volumeMapper);
+    if (mapper == NULL) {
+        vtkUnstructuredGridVolumeMapper *ugmapper = vtkUnstructuredGridVolumeMapper::SafeDownCast(_volumeMapper);
+        if (ugmapper == NULL) {
             TRACE("Mapper does not support BlendMode");
             return;
         }
+        switch (mode) {
+        case BLEND_COMPOSITE:
+            ugmapper->SetBlendModeToComposite();
+            break;
+        case BLEND_MAX_INTENSITY:
+            ugmapper->SetBlendModeToMaximumIntensity();
+            break;
+        case BLEND_MIN_INTENSITY:
+        case BLEND_ADDITIVE:
+        default:
+            ERROR("Unknown BlendMode");
+        }
+    } else {
         switch (mode) {
         case BLEND_COMPOSITE: