Changeset 2597 for trunk/packages

Timestamp:

Oct 2, 2011, 8:55:57 PM (13 years ago)

Author:

ldelgass

Message:

Check for redundant active scalar/vector state and only update ranges if
state has changed.

File:

• trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp (modified) (2 diffs)

trunk/packages/vizservers/vtkvis/RpVtkRenderer.cpp

@@ -783 +783 @@
 
     bool ret = true;
-    do {
-        if (!itr->second->setActiveScalars(scalarName)) {
-            ret = false;
+    bool needRangeUpdate = false;
+    do {
+        if (strcmp(itr->second->getActiveScalarsName(), scalarName) != 0) {
+            if (!itr->second->setActiveScalars(scalarName)) {
+                ret = false;
+            } else {
+                needRangeUpdate = true;
+            }
         }
     } while (doAll && ++itr != _dataSets.end());
 
-    if (ret) {
+    if (needRangeUpdate) {
          updateRanges();
         _needsRedraw = true;
@@ -815 +820 @@
 
     bool ret = true;
-    do {
-        if (!itr->second->setActiveVectors(vectorName)) {
-            ret = false;
+    bool needRangeUpdate = false;
+    do {
+        if (strcmp(itr->second->getActiveVectorsName(), vectorName) != 0) {
+            if (!itr->second->setActiveVectors(vectorName)) {
+                ret = false;
+            } else {
+                needRangeUpdate = true;
+            }
         }
     } while (doAll && ++itr != _dataSets.end());
 
-    if (ret) {
+    if (needRangeUpdate) {
         updateRanges();
         _needsRedraw = true;