Changeset 6379 for trunk

Timestamp:

Jun 12, 2016 1:54:48 AM (8 years ago)

Author:

ldelgass

Message:

Fix limits in protocol

Location:

trunk/gui/scripts

Files:

• vtkglyphviewer.tcl (modified) (1 diff)
• vtkheightmapviewer.tcl (modified) (1 diff)
• vtkisosurfaceviewer.tcl (modified) (2 diffs)
• vtkstreamlinesviewer.tcl (modified) (1 diff)
• vtksurfaceviewer.tcl (modified) (1 diff)

trunk/gui/scripts/vtkglyphviewer.tcl

@@ -3108 +3108 @@
     $itk_component(field) value $_curFldLabel
     if { $_settings(-customrange) } {
-        set limits [list [$itk_component(min) value] [$itk_component(max) value]]
-        SendCmd [list dataset maprange explicit $limits $_curFldName point_data $_curFldComp]
+        set vmin [$itk_component(min) value]
+        set vmax [$itk_component(max) value]
+        SendCmd [list dataset maprange explicit $vmin $vmax $_curFldName point_data $_curFldComp]
     } else {
         if { ![info exists _limits($_curFldName)] } {
             SendCmd "dataset maprange all"
         } else {
-            set limits $_limits($_curFldName)
-            SendCmd [list dataset maprange explicit $limits $_curFldName point_data $_curFldComp]
-        }
-    }
-}
+            foreach { vmin vmax } $_limits($_curFldName) break
+            SendCmd [list dataset maprange explicit $vmin $vmax $_curFldName point_data $_curFldComp]
+        }
+    }
+}

trunk/gui/scripts/vtkheightmapviewer.tcl

@@ -1747 +1747 @@
     set bmax [expr $bmax - $bmin]
     set bmin 0
-    SendCmd [list dataset maprange explicit $_limits($_curFldName) $_curFldName]
+    SendCmd [list dataset maprange explicit $vmin $vmax $_curFldName]
     SendCmd "axis bounds z $bmin $bmax"
     SendCmd "axis range z $_limits($_curFldName)"

trunk/gui/scripts/vtkisosurfaceviewer.tcl

@@ -3136 +3136 @@
     $itk_component(field) value $_curFldLabel
     if { $_settings(-customrange) } {
-        set limits [list [$itk_component(min) value] [$itk_component(max) value]]
-        SendCmd [list dataset maprange explicit $limits $_curFldName]
+        set vmin [$itk_component(min) value]
+        set vmax [$itk_component(max) value]
+        SendCmd [list dataset maprange explicit $vmin $vmax $_curFldName]
+        set limits [list $vmin $vmax]
         if { $limits != $_currentLimits } {
             set _currentLimits $limits
@@ -3146 +3148 @@
             SendCmd "dataset maprange all"
         } else {
-            set limits $_limits($_curFldName)
-            SendCmd [list dataset maprange explicit $limits $_curFldName]
+            foreach { vmin vmax } $_limits($_curFldName) break
+            SendCmd [list dataset maprange explicit $vmin $vmax $_curFldName]
+            set limits [list $vmin $vmax]
             if { $limits != $_currentLimits } {
                 set _currentLimits $limits

trunk/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1352 +1352 @@
                 SendCmd "dataset maprange all"
             } else {
-                SendCmd [list dataset maprange explicit $_limits($_curFldName) $_curFldName]
+                foreach { vmin vmax } $_limits($_curFldName) break
+                SendCmd [list dataset maprange explicit $vmin $vmax $_curFldName]
             }
             SendCmd [list streamlines colormode $_colorMode $_curFldName]

trunk/gui/scripts/vtksurfaceviewer.tcl

@@ -1298 +1298 @@
                 SendCmd "dataset maprange all"
             } else {
-                SendCmd [list dataset maprange explicit $_limits($_curFldName) $_curFldName]
+                foreach { vmin vmax } $_limits($_curFldName) break
+                SendCmd [list dataset maprange explicit $vmin $vmax $_curFldName]
             }
             #SendCmd [list contour2d colormode $_colorMode $_curFldName]