Changeset 5766

Timestamp:

Jul 21, 2015, 9:11:27 AM (9 years ago)

Author:

ldelgass

Message:

Merge r5758:r5765 from trunk

Location:

branches/1.4

Files:

• . (modified) (1 prop)
• gui/scripts/drawing.tcl (modified) (1 diff)
• gui/scripts/field.tcl (modified) (1 diff)
• gui/scripts/vtkstreamlinesviewer.tcl (modified) (23 diffs)

branches/1.4/gui/scripts/drawing.tcl

@@ -93 +93 @@
     }
     foreach {key path} {
+        camera  about.camera
+        color   about.color
         group   about.group
         label   about.label
-        color   about.color
-        camera  about.camera
         type    about.type
+        xdesc   xaxis.description
+        ydesc   yaxis.description
+        zdesc   zaxis.description
         xlabel  xaxis.label
-        xdesc   xaxis.description
+        ylabel  yaxis.label
+        zlabel  zaxis.label
+        xscale  xaxis.scale
+        yscale  yaxis.scale
+        zscale  zaxis.scale
         xunits  xaxis.units
-        xscale  xaxis.scale
+        yunits  yaxis.units
+        zunits  zaxis.units
         xmin    xaxis.min
         xmax    xaxis.max
-        ylabel  yaxis.label
-        ydesc   yaxis.description
-        yunits  yaxis.units
-        yscale  yaxis.scale
         ymin    yaxis.min
         ymax    yaxis.max
-        zlabel  zaxis.label
-        zdesc   zaxis.description
-        zunits  zaxis.units
-        zscale  zaxis.scale
         zmin    zaxis.min
         zmax    zaxis.max

branches/1.4/gui/scripts/field.tcl

@@ -659 +659 @@
         camera          about.camera
         color           about.color
-        default         about.default
         group           about.group
         label           about.label

branches/1.4/gui/scripts/vtkstreamlinesviewer.tcl

@@ -70 +70 @@
     private method BuildDownloadPopup { widget command }
     private method BuildStreamsTab {}
-    private method BuildVolumeTab {}
+    private method BuildSurfaceTab {}
     private method DrawLegend {}
     private method Combo { option }
@@ -135 +135 @@
     private variable _title ""
     private variable _seeds
-
-    private common _downloadPopup;      # download options from popup
-    private common _hardcopy
     private variable _width 0
     private variable _height 0
@@ -145 +142 @@
     private variable _cutplanePending 0
     private variable _legendPending 0
-    private variable _vectorFields
-    private variable _scalarFields
     private variable _fields
     private variable _curFldName ""
@@ -153 +148 @@
     private variable _numSeeds 200
     private variable _colorMode "vmag";#  Mode of colormap (vmag or scalar)
+
+    private common _downloadPopup;      # download options from popup
+    private common _hardcopy
 }
 
@@ -245 +243 @@
         -streamlinesnumseeds        200
         -streamlinesopacity         100
-        -streamlinesscale           1
+        -streamlineslength          70
         -streamlinesseedsvisible    0
         -streamlinesvisible         1
-        -volumeedges                0
-        -volumelighting             1
-        -volumeopacity              40
-        -volumevisible              1
-        -volumewireframe            0
+        -surfaceedges               0
+        -surfacelighting            1
+        -surfaceopacity             40
+        -surfacevisible             1
+        -surfacewireframe           0
         -xgrid                      0
         -ygrid                      0
@@ -330 +328 @@
     Rappture::Tooltip::for $itk_component(zoomout) "Zoom out"
 
-    itk_component add volume {
-        Rappture::PushButton $f.volume \
+    itk_component add surface {
+        Rappture::PushButton $f.surface \
             -onimage [Rappture::icon volume-on] \
             -offimage [Rappture::icon volume-off] \
-            -variable [itcl::scope _settings(-volumevisible)] \
-            -command [itcl::code $this AdjustSetting -volumevisible]
-    }
-    $itk_component(volume) select
-    Rappture::Tooltip::for $itk_component(volume) \
-        "Don't display the volume"
-    pack $itk_component(volume) -padx 2 -pady 2
+            -variable [itcl::scope _settings(-surfacevisible)] \
+            -command [itcl::code $this AdjustSetting -surfacevisible]
+    }
+    $itk_component(surface) select
+    Rappture::Tooltip::for $itk_component(surface) \
+        "Show/Hide the boundary surface"
+    pack $itk_component(surface) -padx 2 -pady 2
 
     itk_component add streamlines {
@@ -351 +349 @@
     $itk_component(streamlines) select
     Rappture::Tooltip::for $itk_component(streamlines) \
-        "Toggle the streamlines on/off"
+        "Show/Hide the streamlines"
     pack $itk_component(streamlines) -padx 2 -pady 2
 
@@ -362 +360 @@
     }
     Rappture::Tooltip::for $itk_component(cutplane) \
-        "Show/Hide cutplanes"
+        "Show/Hide the cutplanes"
     pack $itk_component(cutplane) -padx 2 -pady 2
 
-
     if { [catch {
-        BuildVolumeTab
+        BuildSurfaceTab
         BuildStreamsTab
         BuildCutplaneTab
@@ -1031 +1028 @@
         array unset _fields
         set _curFldName ""
+        set _curFldLabel ""
         foreach cname [$_first components] {
             foreach fname [$_first fieldnames $cname] {
@@ -1047 +1045 @@
                     -command [itcl::code $this Combo invoke]
                 set _fields($fname) [list $label $units $components]
-                if { $_curFldName == "" } {
+                if { $_curFldName == "" && $components == 3 } {
                     set _curFldName $fname
                     set _curFldLabel $label
@@ -1061 +1059 @@
             -streamlineslighting \
             -streamlinescolormap -field \
-            -volumevisible -volumeedges -volumelighting -volumeopacity \
-            -volumewireframe \
+            -surfacevisible -surfaceedges -surfacelighting -surfaceopacity \
+            -surfacewireframe \
             -cutplanevisible \
             -cutplanexposition -cutplaneyposition -cutplanezposition \
@@ -1343 +1341 @@
             set bool $_settings($what)
             SendCmd "cutplane visible $bool"
+            if { $bool } {
+                Rappture::Tooltip::for $itk_component(cutplane) \
+                    "Hide the cutplanes"
+            } else {
+                Rappture::Tooltip::for $itk_component(cutplane) \
+                    "Show the cutplanes"
+            }
         }
         "-cutplanewireframe" {
@@ -1450 +1455 @@
             SendCmd "streamlines opacity $sval"
         }
-        "-streamlinesscale" {
+        "-streamlineslength" {
             set val $_settings($what)
-            set sval [expr { 0.01 * double($val) }]
-            SendCmd "streamlines scale $sval $sval $sval"
+            set sval [expr { (0.01 * double($val)) / 0.7 }]
+            foreach axis {x y z} {
+                foreach {min max} $_limits($axis) break
+                set ${axis}len [expr double($max) - double($min)]
+            }
+            set length [expr { $sval * ($xlen + $ylen + $zlen) } ]
+            SendCmd "streamlines length $length"
         }
         "-streamlineslighting" {
@@ -1459 +1469 @@
             SendCmd "streamlines lighting $bool"
         }
-        "-volumeopacity" {
+        "-surfaceopacity" {
             set val $_settings($what)
             set sval [expr { 0.01 * double($val) }]
             SendCmd "polydata opacity $sval"
         }
-        "-volumewireframe" {
+        "-surfacewireframe" {
             set bool $_settings($what)
             SendCmd "polydata wireframe $bool"
         }
-        "-volumevisible" {
+        "-surfacevisible" {
             set bool $_settings($what)
             SendCmd "polydata visible $bool"
             if { $bool } {
-                Rappture::Tooltip::for $itk_component(volume) \
-                    "Hide the volume"
+                Rappture::Tooltip::for $itk_component(surface) \
+                    "Hide the boundary surface"
             } else {
-                Rappture::Tooltip::for $itk_component(volume) \
-                    "Show the volume"
-            }
-        }
-        "-volumelighting" {
+                Rappture::Tooltip::for $itk_component(surface) \
+                    "Show the boundary surface"
+            }
+        }
+        "-surfacelighting" {
             set bool $_settings($what)
             SendCmd "polydata lighting $bool"
         }
-        "-volumeedges" {
+        "-surfaceedges" {
             set bool $_settings($what)
             SendCmd "polydata edges $bool"
@@ -1544 +1554 @@
     array set style {
         -color BCGYR
-        -levels 6
-        -opacity 1.0
     }
     set tag $dataobj-$comp
@@ -1562 +1570 @@
     array set style $_style($tag)
 
-    set name "$style(-color):$style(-levels):$style(-opacity)"
+    set name "$style(-color)"
     if { ![info exists _colormaps($name)] } {
         BuildColormap $name [array get style]
@@ -1584 +1592 @@
         set cmap "0.0 0.0 0.0 0.0 1.0 1.0 1.0 1.0"
     }
-    if { ![info exists _settings(-volumeopacity)] } {
-        set _settings(-volumeopacity) $style(-opacity)
-    }
-    set max $_settings(-volumeopacity)
-
     set amap "0.0 1.0 1.0 1.0"
     SendCmd "colormap add $name { $cmap } { $amap }"
@@ -1615 +1618 @@
 }
 
-itcl::body Rappture::VtkStreamlinesViewer::BuildVolumeTab {} {
+itcl::body Rappture::VtkStreamlinesViewer::BuildSurfaceTab {} {
 
     set fg [option get $itk_component(hull) font Font]
@@ -1621 +1624 @@
 
     set inner [$itk_component(main) insert end \
-        -title "Volume Settings" \
+        -title "Boundary Surface Settings" \
         -icon [Rappture::icon volume-on]]
     $inner configure -borderwidth 4
 
-    checkbutton $inner.volume \
-        -text "Show Volume" \
-        -variable [itcl::scope _settings(-volumevisible)] \
-        -command [itcl::code $this AdjustSetting -volumevisible] \
+    checkbutton $inner.surface \
+        -text "Show Surface" \
+        -variable [itcl::scope _settings(-surfacevisible)] \
+        -command [itcl::code $this AdjustSetting -surfacevisible] \
         -font "Arial 9"
 
     checkbutton $inner.wireframe \
         -text "Show Wireframe" \
-        -variable [itcl::scope _settings(-volumewireframe)] \
-        -command [itcl::code $this AdjustSetting -volumewireframe] \
+        -variable [itcl::scope _settings(-surfacewireframe)] \
+        -command [itcl::code $this AdjustSetting -surfacewireframe] \
         -font "Arial 9"
 
     checkbutton $inner.lighting \
         -text "Enable Lighting" \
-        -variable [itcl::scope _settings(-volumelighting)] \
-        -command [itcl::code $this AdjustSetting -volumelighting] \
+        -variable [itcl::scope _settings(-surfacelighting)] \
+        -command [itcl::code $this AdjustSetting -surfacelighting] \
         -font "Arial 9"
 
     checkbutton $inner.edges \
         -text "Show Edges" \
-        -variable [itcl::scope _settings(-volumeedges)] \
-        -command [itcl::code $this AdjustSetting -volumeedges] \
+        -variable [itcl::scope _settings(-surfaceedges)] \
+        -command [itcl::code $this AdjustSetting -surfaceedges] \
         -font "Arial 9"
 
     label $inner.opacity_l -text "Opacity" -font "Arial 9"
     ::scale $inner.opacity -from 0 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-volumeopacity)] \
+        -variable [itcl::scope _settings(-surfaceopacity)] \
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting -volumeopacity]
+        -command [itcl::code $this AdjustSetting -surfaceopacity]
 
     blt::table $inner \
@@ -1720 +1723 @@
         -command [itcl::code $this AdjustSetting -streamlinesnumseeds]
 
-    label $inner.scale_l -text "Scale" -font "Arial 9"
+    label $inner.scale_l -text "Length" -font "Arial 9"
     ::scale $inner.scale -from 1 -to 100 -orient horizontal \
-        -variable [itcl::scope _settings(-streamlinesscale)] \
+        -variable [itcl::scope _settings(-streamlineslength)] \
         -width 10 \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting -streamlinesscale]
+        -command [itcl::code $this AdjustSetting -streamlineslength]
 
     label $inner.field_l -text "Color by" -font "Arial 9"
@@ -1751 +1754 @@
         2,0 $inner.mode_l      -anchor w -pady 2  \
         2,1 $inner.mode        -fill x   -pady 2  \
-        3,0 $inner.opacity_l   -anchor w -pady 2  \
-        3,1 $inner.opacity     -fill x -pady 2 \
+        3,0 $inner.scale_l     -anchor w -pady 2  \
+        3,1 $inner.scale       -fill x   -pady 2  \
+        4,0 $inner.opacity_l   -anchor w -pady 2  \
+        4,1 $inner.opacity     -fill x -pady 2 \
         5,0 $inner.lighting    -anchor w -pady 2 -cspan 2 \
         6,0 $inner.seeds       -anchor w -pady 2 -cspan 2 \
@@ -2137 +2142 @@
     set style [$dataobj style $comp]
     array set settings {
-        -color \#808080
+        -color BCGYR
+        -constcolor white
+        -edgecolor black
         -edges 0
-        -edgecolor black
+        -lighting 1
         -linewidth 1.0
-        -opacity 0.4
-        -wireframe 0
-        -lighting 1
+        -mode lines
+        -numseeds 200
+        -opacity 1.0
         -seeds 1
         -seedcolor white
+        -streamlineslength 0.7
+        -surfacecolor white
+        -surfaceedgecolor black
+        -surfaceedges 0
+        -surfacelighting 1
+        -surfaceopacity 0.4
+        -surfacevisible 1
+        -surfacewireframe 0
         -visible 1
     }
@@ -2154 +2169 @@
     StartBufferingCommands
     SendCmd "streamlines add $tag"
-    SendCmd "streamlines seed visible off $tag"
+    SendCmd "streamlines color [Color2RGB $settings(-constcolor)] $tag"
+    SendCmd "streamlines edges $settings(-edges) $tag"
+    SendCmd "streamlines linecolor [Color2RGB $settings(-edgecolor)] $tag"
+    SendCmd "streamlines linewidth $settings(-linewidth) $tag"
+    SendCmd "streamlines lighting $settings(-lighting) $tag"
+    SendCmd "streamlines opacity $settings(-opacity) $tag"
+    SendCmd "streamlines seed color [Color2RGB $settings(-seedcolor)] $tag"
+    SendCmd "streamlines seed visible $settings(-seeds) $tag"
+    SendCmd "streamlines visible $settings(-visible) $tag"
     set seeds [$dataobj hints seeds]
     if { $seeds != "" && ![info exists _seeds($dataobj)] } {
         set length [string length $seeds]
-        SendCmd "streamlines seed fmesh 200 data follows $length $tag"
+        SendCmd "streamlines seed fmesh $settings(-numseeds) data follows $length $tag"
         SendData $seeds
         set _seeds($dataobj) 1
     }
+    set _settings(-streamlineslighting) $settings(-lighting)
+    $itk_component(streammode) value $settings(-mode)
+    AdjustSetting -streamlinesmode
+    set _settings(-streamlinesnumseeds) $settings(-numseeds)
+    set _settings(-streamlinesopacity) [expr $settings(-opacity) * 100.0]
+    set _settings(-streamlineslength) [expr $settings(-streamlineslength) * 100.0]
+    set _settings(-streamlinesseedsvisible) $settings(-seeds)
+    set _settings(-streamlinesvisible) $settings(-visible)
+
     SendCmd "cutplane add $tag"
+
     SendCmd "polydata add $tag"
+    SendCmd "polydata color [Color2RGB $settings(-surfacecolor)] $tag"
     SendCmd "polydata colormode constant {} $tag"
-    set _settings(-volumeedges) $settings(-edges)
-    set _settings(-volumelighting) $settings(-lighting)
-    set _settings(-volumeopacity) $settings(-opacity)
-    set _settings(-volumewireframe) $settings(-wireframe)
-    set _settings(-volumeopacity) [expr $settings(-opacity) * 100.0]
+    SendCmd "polydata edges $settings(-surfaceedges) $tag"
+    SendCmd "polydata linecolor [Color2RGB $settings(-surfaceedgecolor)] $tag"
+    SendCmd "polydata lighting $settings(-surfacelighting) $tag"
+    SendCmd "polydata opacity $settings(-surfaceopacity) $tag"
+    SendCmd "polydata wireframe $settings(-surfacewireframe) $tag"
+    SendCmd "polydata visible $settings(-surfacevisible) $tag"
+    set _settings(-surfaceedges) $settings(-surfaceedges)
+    set _settings(-surfacelighting) $settings(-surfacelighting)
+    set _settings(-surfaceopacity) [expr $settings(-surfaceopacity) * 100.0]
+    set _settings(-surfacewireframe) $settings(-surfacewireframe)
+    set _settings(-surfacevisible) $settings(-surfacevisible)
     StopBufferingCommands
     SetColormap $dataobj $comp
+    $itk_component(colormap) value $settings(-color)
 }