Changeset 3948 for trunk/gui

Timestamp:

Sep 23, 2013 11:21:27 AM (11 years ago)

Author:

gah

Message:

don't display component dropdown if there's only one component.

Location:

trunk/gui/scripts

Files:

• field.tcl (modified) (2 diffs)
• nanovisviewer.tcl (modified) (16 diffs)

trunk/gui/scripts/field.tcl

@@ -926 +926 @@
                 close $f
             }
+            # This is temporary.  I put a check for this in the DxToVtk
+            # parser.  
+            if { [string range $contents  0 3] == "<DX>" } {
+                set contents [string range $contents 4 end]
+            }
             if { [catch { Rappture::DxToVtk $contents } vtkdata] == 0 } {
                 set vector [ReadVtkDataSet $cname $vtkdata]
@@ -936 +941 @@
                 close $f
             }
-            if { $_viewer != "nanovis" } {
+            if { $_viewer != "nanovis" && $_viewer != "flowvis" } {
                 set _type "vtk"
                 set _comp2vtk($cname) $vtkdata

trunk/gui/scripts/nanovisviewer.tcl

@@ -130 +130 @@
 
     private variable _dlist ""     ;# list of data objects
-    private variable _allDataObjs
     private variable _obj2ovride   ;# maps dataobj => style override
     private variable _serverDatasets   ;# contains all the dataobj-component 
@@ -231 +230 @@
         $this-transp            50
         $this-volume            1
+        $this-volumeVisible     1
         $this-xcutplane         1
         $this-xcutposition      0
@@ -240 +240 @@
         $this-zcutposition      0
         $this-zoom              $_view(zoom)    
-        $this-volumeVisible     1
     }]
 
@@ -448 +447 @@
     if {$pos < 0} {
         lappend _dlist $dataobj
-        set _allDataObjs($dataobj) 1
         set _obj2ovride($dataobj-color) $params(-color)
         set _obj2ovride($dataobj-width) $params(-width)
@@ -806 +804 @@
     $c coords title [expr {$w/2}] $ly
 
-
     # The colormap may have changed. Resync the slicers with the colormap.
     set datasets [CurrentDatasets -cutplanes]
-    SendCmd "volume data state $_settings($this-volume) $datasets"
 
     # Adjust the cutplane for only the first component in the topmost volume
@@ -1324 +1320 @@
         }
         "volume" {
-            set datasets [CurrentDatasets -cutplanes] 
-            SendCmd "volume data state $_settings($this-volume) $datasets"
+            # This is the global volume visibility control.  It controls the
+            # visibility of all the all volumes.  Whenever it's changed, you
+            # have to synchronize each of the local controls (see below) with
+            # this.
+            set datasets [CurrentDatasets] 
+            set bool $_settings($this-volume)
+            SendCmd "volume data state $bool $datasets"
+            foreach cname $_componentsList {
+                set _settings($cname-volumeVisible) $bool
+            }
+            set _settings($this-volumeVisible) $bool
         }
         "volumeVisible" {
+            # This is the component specific control.  It changes the 
+            # visibility of only the current component.
             set _settings($_current-volumeVisible) \
                 $_settings($this-volumeVisible)
@@ -1672 +1679 @@
     #set bfont [option get $itk_component(hull) boldFont Font]
 
-    label $inner.shading_l -text "Lighting" -font "Arial 9 bold" 
+    label $inner.lighting_l \
+        -text "Lighting / Material Properties" \
+        -font "Arial 9 bold" 
 
     checkbutton $inner.light2side \
@@ -1691 +1700 @@
     ::scale $inner.ambient -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings($this-ambient)] \
-        -showvalue off -command [itcl::code $this AdjustSetting ambient]
+        -showvalue off -command [itcl::code $this AdjustSetting ambient] \
+        -troughcolor grey92
 
     label $inner.diffuse_l -text "Diffuse" -font $font
     ::scale $inner.diffuse -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings($this-diffuse)] \
-        -showvalue off -command [itcl::code $this AdjustSetting diffuse]
+        -showvalue off -command [itcl::code $this AdjustSetting diffuse] \
+        -troughcolor grey92
 
     label $inner.specularLevel_l -text "Specular" -font $font
     ::scale $inner.specularLevel -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings($this-specularLevel)] \
-        -showvalue off -command [itcl::code $this AdjustSetting specularLevel]
+        -showvalue off -command [itcl::code $this AdjustSetting specularLevel] \
+        -troughcolor grey92
 
     label $inner.specularExponent_l -text "Shininess" -font $font
@@ -1707 +1719 @@
         -variable [itcl::scope _settings($this-specularExponent)] \
         -showvalue off \
-        -command [itcl::code $this AdjustSetting specularExponent]
+        -command [itcl::code $this AdjustSetting specularExponent] \
+        -troughcolor grey92
 
     label $inner.transp_l -text "Opacity" -font $font
     ::scale $inner.transp -from 0 -to 100 -orient horizontal \
         -variable [itcl::scope _settings($this-transp)] \
-        -showvalue off -command [itcl::code $this AdjustSetting transp]
-
-    label $inner.tf -text "Transfer Function" -font "Arial 9 bold" 
+        -showvalue off -command [itcl::code $this AdjustSetting transp] \
+        -troughcolor grey92
+
+    label $inner.transferfunction_l \
+        -text "Transfer Function" -font "Arial 9 bold" 
 
     label $inner.thin -text "Thin" -font $font
     ::scale $inner.thickness -from 0 -to 1000 -orient horizontal \
         -variable [itcl::scope _settings($this-thickness)] \
-        -showvalue off -command [itcl::code $this AdjustSetting thickness]
+        -showvalue off -command [itcl::code $this AdjustSetting thickness] \
+        -troughcolor grey92
+
     label $inner.thick -text "Thick" -font $font
 
@@ -1761 +1778 @@
 
     blt::table $inner \
-        0,1 $inner.volcomponents_l -anchor e \
+        0,0 $inner.volcomponents_l -anchor e -cspan 2 \
         0,2 $inner.volcomponents             -cspan 3 -fill x \
-        1,0 $inner.shading_l -anchor w -cspan 5 \
+        1,1 $inner.lighting_l -anchor w -cspan 4 \
         2,1 $inner.ambient_l       -anchor e -pady 2 \
         2,2 $inner.ambient                   -cspan 3 -fill x \
@@ -1774 +1791 @@
         6,1 $inner.light2side -cspan 3 -anchor w \
         7,1 $inner.visibility -cspan 3 -anchor w \
-        8,0 $inner.tf -anchor w              -cspan 5 \
+        8,1 $inner.transferfunction_l -anchor w              -cspan 4 \
         9,1 $inner.transp_l -anchor e -pady 2 \
         9,2 $inner.transp                    -cspan 3 -fill x \
         10,1 $inner.colormap_l       -anchor e \
-        10,2 $inner.colormap                  -cspan 3 -fill x \
+        10,2 $inner.colormap                  -padx 2 -cspan 3 -fill x \
         11,1 $inner.thin             -anchor e \
         11,2 $inner.thickness                 -cspan 2 -fill x \
@@ -2122 +2139 @@
 
 
+#
+# InitComponentSettings --
+#
+#       Initializes the volume settings for a specific component. This
+#       should match what's used as global settings above. This
+#       is called the first time we try to switch to a given component
+#       in SwitchComponent below.
+#
 itcl::body Rappture::NanovisViewer::InitComponentSettings { cname } { 
     array set _settings [subst {
-        $cname-ambient           20
+        $cname-ambient           60
         $cname-colormap          default
-        $cname-diffuse           80
+        $cname-diffuse           40
         $cname-light2side        1
         $cname-opacity           100
@@ -2138 +2163 @@
 }
 
-# Reset global settings from dataset's settings.
+#
+# SwitchComponent --
+#
+#       This is called when the current component is changed by the
+#       dropdown menu in the volume tab.  It synchronizes the global
+#       volume settings with the settings of the new current component.
+#
 itcl::body Rappture::NanovisViewer::SwitchComponent { cname } { 
     if { ![info exists _settings($cname-ambient)] } {
@@ -2159 +2190 @@
 }
 
-# Reset global settings from dataset's settings.
+#
+# BuildVolumeComponents --
+#
+#       This is called from the "scale" method which is called when a
+#       new dataset is added or deleted.  It repopulates the dropdown
+#       menu of volume component names.  It sets the current component
+#       to the first component in the list (of components found).
+#       Finally, if there is only one component, don't display the
+#       label or the combobox in the volume settings tab.
+#
 itcl::body Rappture::NanovisViewer::BuildVolumeComponents {} { 
     $itk_component(volcomponents) choices delete 0 end
@@ -2167 +2207 @@
     set _current [lindex $_componentsList 0]
     $itk_component(volcomponents) value $_current
-}
-
-# Reset global settings from dataset's settings.
+    set parent [winfo parent $itk_component(volcomponents)]
+    if { [llength $_componentsList] <= 1 } {
+        # Unpack the components label and dropdown if there's only one
+        # component. 
+        blt::table forget $parent.volcomponents_l $parent.volcomponents
+    } else {
+        # Pack the components label and dropdown into the table there's 
+        # more than one component to select. 
+        blt::table $parent \
+            0,0 $parent.volcomponents_l -anchor e -cspan 2 \
+            0,2 $parent.volcomponents -cspan 3 -fill x 
+    }
+}
+
+#
+# GetDatasetsWithComponents --
+#
+#       Returns a list of all the datasets (known by the combination of
+#       their data object and component name) that match the given 
+#       component name.  For example, this is used where we want to change 
+#       the settings of volumes that have the current component.
+#
 itcl::body Rappture::NanovisViewer::GetDatasetsWithComponent { cname } { 
     if { ![info exists _volcomponents($cname)] } {
@@ -2187 +2246 @@
 # HideAllMarkers --
 #
-#       Hide all the markers.  Can't simply delete and recreate markers
-#       from the <style> since the user may have create, deleted, or moved
-#       markers.
+#       Hide all the markers in all the transfer functions.  Can't simply 
+#       delete and recreate markers from the <style> since the user may 
+#       have create, deleted, or moved markers.
 #
 itcl::body Rappture::NanovisViewer::HideAllMarkers {} {