Changeset 5812

Timestamp:

Aug 20, 2015 11:31:53 AM (8 years ago)

Author:

ldelgass

Message:

Fixes for setting active vectors (use same code for scalars and vectors)

Location:

vtkvis/branches/1.8

Files:

• DataSet.cpp (modified) (1 diff)
• Renderer.cpp (modified) (1 diff)

vtkvis/branches/1.8/DataSet.cpp

@@ -473 +473 @@
     bool found = false;
     if (_dataSet != NULL) {
-        if (_dataSet->GetPointData() != NULL) {
-            if (_dataSet->GetPointData()->SetActiveVectors(name) >= 0) {
-                TRACE("Set active point data vectors to %s", name);
-                found = true;
-            }
-        }
-        if (_dataSet->GetCellData() != NULL) {
-            if (_dataSet->GetCellData()->SetActiveVectors(name) >= 0) {
-                TRACE("Set active cell data vectors 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()->SetActiveVectors(name) >= 0) {
+                    TRACE("Set active point data vectors for %s to %s", getName().c_str(), name);
+                    found = true;
+                }
+            }
+            if (_dataSet->GetCellData() != NULL) {
+                if (_dataSet->GetCellData()->SetActiveVectors(name) >= 0) {
+                    TRACE("Set active cell data vectors for %s to %s", getName().c_str(), name);
+                    found = true;
+                }
+            }
+        }
+    }
+#ifdef WANT_TRACE
+    if (_dataSet->GetPointData() != NULL) {
+        if (_dataSet->GetPointData()->GetVectors() != NULL) {
+            TRACE("Point data vectors for %s: %s", getName().c_str(), _dataSet->GetPointData()->GetVectors()->GetName());
+        } else {
+            TRACE("NULL point data vectors for %s", getName().c_str());
+        }
+    }
+    if (_dataSet->GetCellData() != NULL) {
+        if (_dataSet->GetCellData()->GetVectors() != NULL) {
+            TRACE("Cell data vectors for %s: %s", getName().c_str(), _dataSet->GetCellData()->GetVectors()->GetName());
+        } else {
+            TRACE("NULL cell data vectors for %s", getName().c_str());
+        }
+    }
+#endif
     return found;
 }

vtkvis/branches/1.8/Renderer.cpp

@@ -428 +428 @@
     bool needRangeUpdate = false;
     do {
-        if (strcmp(itr->second->getActiveVectorsName(), vectorName) != 0) {
+        const char *name = itr->second->getActiveVectorsName();
+        if (name == NULL || (strcmp(name, vectorName) != 0)) {
             if (!itr->second->setActiveVectors(vectorName)) {
                 ret = false;