Changeset 4186 for branches

Timestamp:

Feb 20, 2014 3:16:12 PM (10 years ago)

Author:

ldelgass

Message:

merge trunk version of isosurface viewer

File:

• branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) (13 diffs)

branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl

@@ -150 +150 @@
     private variable _legendPending 0
     private variable _field      ""
-    private variable _colorMode "vmag"; #  Mode of colormap (vmag or scalar)
+    private variable _colorMode "scalar";       #  Mode of colormap (vmag or scalar)
     private variable _fieldNames {} 
     private variable _fields 
@@ -235 +235 @@
         cutplaneEdges           0
         cutplaneLighting        1
-        cutplanePreinterp       0
+        cutplanePreinterp       1
         cutplaneOpacity         100
         cutplaneVisible         0
@@ -440 +440 @@
 
     eval itk_initialize $args
+
+    EnableWaitDialog 500
     Connect
     update
@@ -772 +774 @@
         if { $_reportClientInfo }  {
             # Tell the server the viewer, hub, user and session.
-            # Do this immediately on connect before buffing any commands
+            # Do this immediately on connect before buffering any commands
             global env
 
@@ -875 +877 @@
         set _hardcopy($tag) $bytes
     }
-    EventuallyRequestLegend
 }
 
@@ -1507 +1508 @@
     set font "Arial 8"
     set lineht [font metrics $font -linespace]
-    set c $itk_component(view)
     set w 12
     set h [expr {$_height - 2 * ($lineht + 2)}]
-    if { $h < 1} {
+    if { $h < 1 } {
         return
     }
@@ -1698 +1698 @@
     itk_component add numcontours {
         Rappture::Spinint $inner.numcontours \
-            -min 1 -max 50 -font "arial 9"
+            -min 0 -max 50 -font "arial 9"
     }
     $itk_component(numcontours) value $_settings(numContours)
@@ -1773 +1773 @@
         "static_triad"    "static" \
         "closest_triad"   "closest" \
-        "furthest_triad"  "furthest" \
+        "furthest_triad"  "farthest" \
         "outer_edges"     "outer"         
     $itk_component(axisMode) value "static"
@@ -2116 +2116 @@
     }
     array set style [$dataobj style $comp]
-    if { $dataobj != $_first } {
+    if { $dataobj != $_first || $style(-levels) == 1 } {
         set style(-opacity) 1
     }
-    if { $_currentColormap == "" } {
-        set stylelist [$dataobj style $comp]
-        if { $stylelist != "" } {
-            array set style $stylelist
-            set stylelist [array get style]
-            SetCurrentColormap $stylelist
-        }
-        $itk_component(colormap) value $style(-color)
-    }
     SendCmd "cutplane add $tag"
-    SendCmd "cutplane edges 0 $tag"
-    SendCmd "cutplane wireframe 0 $tag"
-    SendCmd "cutplane lighting 1 $tag"
-    SendCmd "cutplane linewidth 1 $tag"
-
-    foreach axis { x y z } {
-        SendCmd "cutplane slice $axis 0.5 $tag"
-        SendCmd "cutplane axis $axis 0 $tag"
-    }
+    SendCmd "cutplane visible 0 $tag"
+
     # This is too complicated.  We want to set the colormap, number of
     # isolines and opacity for the dataset.  They can be the default values,
@@ -2157 +2141 @@
     }
     if { $_currentColormap == "" } {
+        SetCurrentColormap $style(-color)
         $itk_component(colormap) value $style(-color)
     }
@@ -2296 +2281 @@
         "move" {
             set axis [lindex $args 0]
-            set a [string toupper $axis]
-            set oldval $_settings(cutplane${a}Position)
             set newval [lindex $args 1]
             if {[llength $args] != 2} {
@@ -2505 +2488 @@
     set _currentColormap $name
     SendCmd "contour3d colormap $_currentColormap"
+    SendCmd "cutplane colormap $_currentColormap"
 }
 
@@ -2546 +2530 @@
         return
     }
+    if { $_currentNumContours < 1 } {
+        set _contourList ""
+        return
+    }
     foreach { vmin vmax } $_limits($_curFldName) break
     set v [blt::vector create \#auto]