Changeset 5083 for branches/uiuc_vtk_viewers

Timestamp:

Mar 5, 2015 6:06:27 AM (8 years ago)

Author:

dkearney

Message:

merging from trunk to uvv branch

Location:

branches/uiuc_vtk_viewers

Files:

• . (modified) (1 prop)
• gui/scripts/images/ask.png (modified) (1 prop) (previous)
• gui/scripts/images/folder.gif (modified) (1 prop) (previous)
• gui/scripts/images/molvis-3dorth.gif (modified) (1 prop) (previous)
• gui/scripts/images/molvis-3dpers.gif (modified) (1 prop) (previous)
• gui/scripts/images/popup.png (modified) (1 prop) (previous)
• gui/scripts/panes.tcl (modified) (1 diff)
• gui/scripts/visviewer.tcl (modified) (5 diffs)
• gui/scripts/vtkglyphviewer.tcl (modified) (1 diff)
• gui/scripts/vtkisosurfaceviewer.tcl (modified) (29 diffs)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (2 diffs)
• gui/scripts/vtksurfaceviewer.tcl (modified) (1 diff)
• gui/scripts/vtkvolumeviewer.tcl (modified) (1 diff)

branches/uiuc_vtk_viewers/gui/scripts/panes.tcl

@@ +1 @@
+# -*- mode: tcl; indent-tabs-mode: nil -*-
 # ----------------------------------------------------------------------
 #  COMPONENT: Panes - creates a series of adjustable panes

branches/uiuc_vtk_viewers/gui/scripts/visviewer.tcl

@@ -60 +60 @@
     protected variable _debugConsole 0
     protected variable _reportClientInfo 1
+    # Number of milliscends to wait for server reply before displaying wait
+    # dialog.  If set to 0, dialog is never displayed.
     protected variable _waitTimeout 0
 
@@ -99 +101 @@
     protected method SendBytes { bytes }
     protected method SendCmd {string}
-    protected method SendCmdNoWait {string}
     protected method SendEcho { channel {data ""} }
     protected method StartBufferingCommands {}
@@ -487 +488 @@
 # StartWaiting --
 #
-#    Read some number of bytes from the visualization server.
-#
-
+#    Display a waiting dialog after a timeout has passed
+#
 itcl::body Rappture::VisViewer::StartWaiting {} {
     if { $_waitTimeout > 0 } {
@@ -497 +497 @@
 }
 
+#
+# StopWaiting --
+#
+#    Take down waiting dialog
+#
 itcl::body Rappture::VisViewer::StopWaiting {} {
     if { $_waitTimeout > 0 } {
@@ -1201 +1206 @@
     }
 }
-
-#
-# SendCmdNoWait
-#
-#       Send commands off to the rendering server.  If we're currently
-#       sending data objects to the server, buffer the commands to be
-#       sent later.
-#
-itcl::body Rappture::VisViewer::SendCmdNoWait {string} {
-    incr _cmdSeq
-    if {$_trace} {
-        puts stderr "$_cmdSeq>>[string range $string 0 70]"
-    }
-    if { $_buffering } {
-        append _outbuf $string "\n"
-    } else {
-        SendBytes "$string\n"
-    }
-}

branches/uiuc_vtk_viewers/gui/scripts/vtkglyphviewer.tcl

@@ -1562 +1562 @@
     if { $_currentColormap != ""  } {
         set cmap $_currentColormap
-        SendCmdNoWait "legend $cmap $_colorMode $_curFldName {} $w $h 0"
+        SendCmd "legend $cmap $_colorMode $_curFldName {} $w $h 0"
     }
 }

branches/uiuc_vtk_viewers/gui/scripts/vtkisosurfaceviewer.tcl

@@ -87 +87 @@
     private method GetImage { args }
     private method GetVtkData { args }
-    private method InitSettings { args  }
+    private method InitSettings { args }
     private method IsValidObject { dataobj }
     private method LeaveLegend {}
@@ -293 +293 @@
     array set _changed {
         -colormap                0
+        -cutplaneedges           0
+        -cutplanelighting        0
+        -cutplaneopacity         0
+        -cutplanepreinterp       0
+        -cutplanesvisible        0
+        -cutplanewireframe       0
+        -isosurfaceedges         0
+        -isosurfacelighting      0
         -isosurfaceopacity       0
-        -cutplaneopacity         0
+        -isosurfacevisible       0
+        -isosurfacewireframe     0
         -numcontours             0
+        -outline                 0
+        -xcutplaneposition       0
+        -xcutplanevisible        0
+        -ycutplaneposition       0
+        -ycutplanevisible        0
+        -zcutplaneposition       0
+        -zcutplanevisible        0
     }
     array set _widget {
@@ -1416 +1432 @@
         }
         "-cutplaneedges" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "cutplane edges $bool"
         }
         "-cutplanelighting" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "cutplane lighting $bool"
         }
         "-cutplaneopacity" {
+            set _changed($what) 1
             set _settings($what) [expr $_widget($what) * 0.01]
             SendCmd "cutplane opacity $_settings($what)"
         }
         "-cutplanepreinterp" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "cutplane preinterp $bool"
         }
         "-cutplanesvisible" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "cutplane visible 0"
@@ -1448 +1469 @@
         }
         "-cutplanewireframe" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "cutplane wireframe $bool"
@@ -1516 +1538 @@
         }
         "-isosurfaceedges" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "contour3d edges $bool"
         }
         "-isosurfacelighting" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "contour3d lighting $bool"
         }
         "-isosurfaceopacity" {
+            set _changed($what) 1
             set _settings($what) [expr $_widget($what) * 0.01]
             SendCmd "contour3d opacity $_settings($what)"
         }
         "-isosurfacevisible" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "contour3d visible 0"
@@ -1544 +1570 @@
         }
         "-isosurfacewireframe" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "contour3d wireframe $bool"
@@ -1554 +1581 @@
         }
         "-numcontours" {
+            set _changed($what) 1
             set _settings($what) [$itk_component(numcontours) value]
             if { $_contourList(numLevels) != $_settings($what) } {
@@ -1569 +1597 @@
         }
         "-outline" {
+            set _changed($what) 1
             set bool $_settings($what)
             SendCmd "outline visible 0"
@@ -1590 +1619 @@
         }
         "-xcutplanevisible" - "-ycutplanevisible" - "-zcutplanevisible" {
+            set _changed($what) 1
             set axis [string tolower [string range $what 1 1]]
             set bool $_settings($what)
@@ -1602 +1632 @@
         }
         "-xcutplaneposition" - "-ycutplaneposition" - "-zcutplaneposition" {
+            set _changed($what) 1
             set axis [string tolower [string range $what 1 1]]
             set pos [expr $_settings($what) * 0.01]
@@ -1663 +1694 @@
     if { $_currentColormap != ""  } {
         set cmap $_currentColormap
-        SendCmdNoWait "legend $cmap scalar $_curFldName {} $w $h 0"
+        SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
     }
 }
@@ -1821 +1852 @@
     }
     itk_component add min {
-        Rappture::Gauge $inner.min \
+        Rappture::Gauge $inner.min -font "Arial 9" \
             -validatecommand [itcl::code $this LegendRangeValidate "" vmin]
     }
@@ -1831 +1862 @@
     }
     itk_component add max {
-        Rappture::Gauge $inner.max \
+        Rappture::Gauge $inner.max -font "Arial 9" \
             -validatecommand [itcl::code $this LegendRangeValidate "" vmax]
     }
@@ -2257 +2288 @@
     array set style {
         -color                  BCGYR
+        -cutplaneedges          0
+        -cutplanelighting       1
+        -cutplaneopacity        1.0
+        -cutplanepreinterp      1
         -cutplanesvisible       0
+        -cutplanewireframe      0
         -edgecolor              black
         -edges                  0
@@ -2288 +2324 @@
     # the code to handle aberrant cases.
 
+    if { $_changed(-isosurfaceedges) } {
+        set style(-edges) $_settings(-isosurfaceedges)
+    }
+    if { $_changed(-isosurfacelighting) } {
+        set style(-lighting) $_settings(-isosurfacelighting)
+    }
     if { $_changed(-isosurfaceopacity) } {
         set style(-opacity) $_settings(-isosurfaceopacity)
+    }
+    if { $_changed(-isosurfacewireframe) } {
+        set style(-wireframe) $_settings(-isosurfacewireframe)
     }
     if { $_changed(-numcontours) } {
@@ -2311 +2356 @@
         EventuallyChangeContourLevels
     }
-    set _settings(-isosurfacevisible) $style(-isosurfacevisible)
-    set _settings(-cutplanesvisible)  $style(-cutplanesvisible)
-    set _settings(-xcutplanevisible)  $style(-xcutplanevisible)
-    set _settings(-ycutplanevisible)  $style(-ycutplanevisible)
-    set _settings(-zcutplanevisible)  $style(-zcutplanevisible)
-    set _settings(-xcutplaneposition) $style(-xcutplaneposition)
-    set _settings(-ycutplaneposition) $style(-ycutplaneposition)
-    set _settings(-zcutplaneposition) $style(-zcutplaneposition)
+    foreach setting {-outline -isosurfacevisible -cutplanesvisible \
+                     -xcutplanevisible -ycutplanevisible -zcutplanevisible \
+                     -xcutplaneposition -ycutplaneposition -zcutplaneposition \
+                     -cutplaneedges -cutplanelighting -cutplaneopacity \
+                     -cutplanepreinterp -cutplanewireframe} {
+        if {$_changed($setting)} {
+            # User-modified UI setting overrides style
+            set style($setting) $_settings($setting)
+        } else {
+            # Set UI control to style setting (tool provided or default)
+            set _settings($setting) $style($setting)
+        }
+    }
 
     SendCmd "cutplane add $tag"
     SendCmd "cutplane color [Color2RGB $itk_option(-plotforeground)] $tag"
     foreach axis {x y z} {
-        set pos [expr $_settings(-${axis}cutplaneposition) * 0.01]
-        set visible $_settings(-${axis}cutplanevisible)
+        set pos [expr $style(-${axis}cutplaneposition) * 0.01]
+        set visible $style(-${axis}cutplanevisible)
         SendCmd "cutplane slice $axis $pos $tag"
         SendCmd "cutplane axis $axis $visible $tag"
     }
+    SendCmd "cutplane edges $style(-cutplaneedges) $tag"
+    SendCmd "cutplane lighting $style(-cutplanelighting) $tag"
+    SendCmd "cutplane opacity $style(-cutplaneopacity) $tag"
+    SendCmd "cutplane preinterp $style(-cutplanepreinterp) $tag"
+    SendCmd "cutplane wireframe $style(-cutplanewireframe) $tag"
     SendCmd "cutplane visible $style(-cutplanesvisible) $tag"
 
@@ -2333 +2388 @@
     SendCmd "outline color [Color2RGB $itk_option(-plotforeground)] $tag"
     SendCmd "outline visible $style(-outline) $tag"
-    set _settings(-outline) $style(-outline)
 
     GenerateContourList
@@ -2340 +2394 @@
     SendCmd "contour3d edges $style(-edges) $tag"
     set _settings(-isosurfaceedges) $style(-edges)
-    #SendCmd "contour3d color [Color2RGB $settings(-color)] $tag"
+    #SendCmd "contour3d color [Color2RGB $style(-color)] $tag"
     SendCmd "contour3d lighting $style(-lighting) $tag"
     set _settings(-isosurfacelighting) $style(-lighting)
@@ -2417 +2471 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: LegendPointToValue <x> <y>
@@ -2449 +2502 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: LegendProbeSingleContour <x> <y>
@@ -2461 +2513 @@
     SendCmd [list contour3d contourlist $value]
 }
-
 
 #
@@ -2819 +2870 @@
 }
 
-
 itcl::body Rappture::VtkIsosurfaceViewer::MouseOver2Which {} {
     switch -- $_mouseOver {
@@ -2834 +2884 @@
     return $which
 }
-
 
 # ----------------------------------------------------------------------
@@ -2926 +2975 @@
 }
 
-
 # ----------------------------------------------------------------------
 # USAGE: ToggleCustomRange
@@ -2983 +3031 @@
     AdjustSetting -range
 }
-
 
 # ----------------------------------------------------------------------
@@ -3019 +3066 @@
 }
 
-
 #
 # SetCurrentColormap --
@@ -3082 +3128 @@
         set values $_contourList(reqValues)
     } else {
-        # use the field limits to calculate the contour list values
-        foreach { vmin vmax } $_limits($_curFldName) break
-
-        # if custom range has been set and are within the field's
-        # range, use the custom min and max to generate contour list values
+        # if custom range has been set, use the custom min and max
+        # to generate contour list values
         if { $_settings(-customrange) } {
-            if { [$itk_component(min) value] > $vmin } {
-                set vmin [$itk_component(min) value]
-            }
-            if { [$itk_component(max) value] < $vmax } {
-                set vmax [$itk_component(max) value]
-            }
+            set vmin [$itk_component(min) value]
+            set vmax [$itk_component(max) value]
+        } else {
+            # use the field limits to calculate the contour list values
+            foreach { vmin vmax } $_limits($_curFldName) break
         }
 
@@ -3134 +3176 @@
     }
     $itk_component(field) value $_curFldLabel
-    if { ![info exists _limits($_curFldName)] } {
-        SendCmd "dataset maprange all"
-    } else {
-        set limits $_limits($_curFldName)
+    if { $_settings(-customrange) } {
+        set limits [list [$itk_component(min) value] [$itk_component(max) value]]
         SendCmd "dataset maprange explicit $limits $_curFldName"
         if { $limits != $_currentLimits } {
@@ -3143 +3183 @@
             EventuallyChangeContourLevels
         }
-    }
-}
+    } else {
+        if { ![info exists _limits($_curFldName)] } {
+            SendCmd "dataset maprange all"
+        } else {
+            set limits $_limits($_curFldName)
+            SendCmd "dataset maprange explicit $limits $_curFldName"
+            if { $limits != $_currentLimits } {
+                set _currentLimits $limits
+                EventuallyChangeContourLevels
+            }
+        }
+    }
+}

branches/uiuc_vtk_viewers/gui/scripts/vtkstreamlinesviewer.tcl

@@ -1238 +1238 @@
 itcl::body Rappture::VtkStreamlinesViewer::Pick {x y} {
     foreach tag [CurrentDatasets -visible] {
-        SendCmdNoWait "dataset getscalar pixel $x $y $tag"
+        SendCmd "dataset getscalar pixel $x $y $tag"
     }
 }
@@ -1522 +1522 @@
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            SendCmdNoWait \
+            SendCmd \
                 "legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"
             break;

branches/uiuc_vtk_viewers/gui/scripts/vtksurfaceviewer.tcl

@@ -1475 +1475 @@
     if { $_currentColormap != ""  } {
         set cmap $_currentColormap
-        SendCmdNoWait "legend $cmap scalar $_curFldName {} $w $h 0"
+        SendCmd "legend $cmap scalar $_curFldName {} $w $h 0"
     }
 }

branches/uiuc_vtk_viewers/gui/scripts/vtkvolumeviewer.tcl

@@ -1640 +1640 @@
         foreach {dataobj comp} [split $dataset -] break
         if { [info exists _dataset2style($dataset)] } {
-            SendCmdNoWait \
+            SendCmd \
                 "legend2 $_dataset2style($dataset) $w $h"
                 #"legend $_dataset2style($dataset) $_colorMode $_curFldName {} $w $h 0"