Changeset 4460

Timestamp:

Jul 3, 2014 10:17:55 AM (10 years ago)

Author:

ldelgass

Message:

merge streamlines viewer from trunk

File:

• branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl (modified) (8 diffs)

branches/1.3/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1 +1 @@
 # -*- mode: tcl; indent-tabs-mode: nil -*- 
 # ----------------------------------------------------------------------
-#  COMPONENT: vtkviewer - Vtk drawing object viewer
+#  COMPONENT: vtkstreamlinesviewer - Vtk streamlines object viewer
 #
 #  It connects to the Vtk server running on a rendering farm,
@@ -7 +7 @@
 # ======================================================================
 #  AUTHOR:  Michael McLennan, Purdue University
-#  Copyright (c) 2004-2012  HUBzero Foundation, LLC
+#  Copyright (c) 2004-2014  HUBzero Foundation, LLC
 #
 #  See the file "license.terms" for information on usage and
@@ -1021 +1021 @@
             set label [$_first hints ${axis}label]
             if { $label != "" } {
-                SendCmd "axis name $axis $label"
+                SendCmd [list axis name $axis $label]
             }
             set units [$_first hints ${axis}units]
             if { $units != "" } {
-                SendCmd "axis units $axis $units"
+                SendCmd [list axis units $axis $units]
             }
         }
@@ -1483 +1483 @@
             }
             # Get the new limits because the field changed.
-            SendCmd "dataset maprange explicit $_limits($_curFldName) $_curFldName"
+            if { ![info exists _limits($_curFldName)] } {
+                SendCmd "dataset maprange all"
+            } else {
+                SendCmd "dataset maprange explicit $_limits($_curFldName) $_curFldName"
+            }
             SendCmd "streamlines colormode $_colorMode $_curFldName"
             SendCmd "cutplane colormode $_colorMode $_curFldName"
@@ -1504 +1508 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(legend)
     set w 12
     set h [expr {$_height - 3 * ($lineht + 2)}]
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -1736 +1739 @@
         Rappture::Combobox $inner.colormap -width 10 -editable no
     }
-
     $inner.colormap choices insert end [GetColormapList]
+
     $itk_component(colormap) value "BCGYR"
     bind $inner.colormap <<Value>> \
@@ -1806 +1809 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axismode) value "static"
@@ -2344 +2347 @@
         "move" {
             set axis [lindex $args 0]
-            set oldval $_settings(axis-${axis}position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {