Changeset 5645 for trunk

Timestamp:

May 31, 2015, 6:56:56 PM (9 years ago)

Author:

ldelgass

Message:

More syncing nanovis/flowvis viewers. Only call SetObjectStyle? on first load
of data. Init cutplane positions in Rebuild, add some checks to DrawLegend?.

Location:

trunk/gui/scripts

Files:

• flowvisviewer.tcl (modified) (2 diffs)
• nanovisviewer.tcl (modified) (5 diffs)

trunk/gui/scripts/flowvisviewer.tcl

@@ -992 +992 @@
     }
 
+    if {$tag == "" || ![info exists _dataset2style($tag)]} {
+        return
+    }
     # Display the markers used by the current transfer function.
     set tf $_dataset2style($tag)
@@ -1001 +1004 @@
     $c coords vmax [expr {$w-$lx}] $ly
 
+    if { $_first == "" } {
+        return
+    }
     set title [$_first hints label]
     set units [$_first hints units]

trunk/gui/scripts/nanovisviewer.tcl

@@ -782 +782 @@
     # Display the markers used by the current transfer function.
     HideAllMarkers
+    if {$cname == "" || ![info exists _transferFunctionEditors($cname)]} {
+        return
+    }
     $_transferFunctionEditors($cname) showMarkers $_limits($cname)
 
@@ -791 +794 @@
     $c coords vmax [expr {$w-$lx}] $ly
 
+    if { $_first == "" } {
+        return
+    }
     set title [$_first hints label]
     set units [$_first hints units]
@@ -905 +911 @@
                 SendData $data
                 set _datasets($tag) 1
-            }
-            SetObjectStyle $dataobj $cname
+                SetObjectStyle $dataobj $cname
+            }
             if { [info exists _obj2ovride($dataobj-raise)] } {
                 SendCmd "volume state 1 $tag"
@@ -912 +918 @@
         }
     }
-    # Outline seems to need to be reset every update.
-    InitSettings -outlinevisible -cutplanesvisible
+
+    # Turn off cutplanes for all volumes
+    foreach axis {x y z} {
+        SendCmd "cutplane state 0 $axis"
+    }
+
+    InitSettings -outlinevisible -cutplanesvisible \
+        -xcutplanevisible -ycutplanevisible -zcutplanevisible \
+        -xcutplaneposition -ycutplaneposition -zcutplaneposition
+
     if { $_reset } {
-        # Turn off cutplanes for all volumes
-        foreach axis {x y z} {
-            SendCmd "cutplane state 0 $axis"
-        }
-
         InitSettings -axesvisible -gridvisible \
-            -light2side -isosurfaceshading -opacity \
+            -opacity -light2side -isosurfaceshading \
             -ambient -diffuse -specularlevel -specularexponent \
-            -xcutplanevisible -ycutplanevisible -zcutplanevisible \
             -current
 
@@ -959 +967 @@
         updateTransferFunctions
     }
+
     # Actually write the commands to the server socket.  If it fails, we don't
     # care.  We're finished here.