Changeset 4121 for trunk/gui/scripts

Timestamp:

Jan 15, 2014 2:18:29 PM (10 years ago)

Author:

gah

Message:

feature: add background color controls to nanovisviewer and vtkvolumeviewer

Location:

trunk/gui/scripts

Files:

• nanovisviewer.tcl (modified) (5 diffs)
• transferfunctioneditor.tcl (modified) (1 diff)
• vtkvolumeviewer.tcl (modified) (7 diffs)

trunk/gui/scripts/nanovisviewer.tcl

@@ -217 +217 @@
 
     array set _settings [subst {
+        background              black
         $this-ambient           60
         $this-colormap          default
@@ -1246 +1247 @@
             SwitchComponent $cname
         }
+        "background" {
+            set bgcolor [$itk_component(background) value]
+            array set fgcolors {
+                "black" "white"
+                "white" "black"
+                "grey"  "black"
+            }
+            configure -plotbackground $bgcolor \
+                -plotforeground $fgcolors($bgcolor)
+            DrawLegend $_current
+        }
         ambient {
             set val $_settings($this-ambient)
@@ -1679 +1691 @@
         -font "Arial 9"
 
+    label $inner.background_l -text "Background" -font "Arial 9" 
+    itk_component add background {
+        Rappture::Combobox $inner.background -width 10 -editable no
+    }
+    $inner.background choices insert end \
+        "black"              "black"            \
+        "white"              "white"            \
+        "grey"               "grey"             
+
+    $itk_component(background) value $_settings(background)
+    bind $inner.background <<Value>> [itcl::code $this AdjustSetting background]
+
     blt::table $inner \
         0,0 $inner.axes  -cspan 2 -anchor w \
@@ -1684 +1708 @@
         2,0 $inner.outline  -cspan 2 -anchor w \
         3,0 $inner.volume  -cspan 2 -anchor w \
-        4,0 $inner.legend  -cspan 2 -anchor w 
+        4,0 $inner.legend  -cspan 2 -anchor w \
+        5,0 $inner.background_l       -anchor e -pady 2 \
+        5,1 $inner.background                   -fill x \
 
     if 0 {
@@ -1690 +1716 @@
     }
     blt::table configure $inner r* -resize none
-    blt::table configure $inner r5 -resize expand
+    blt::table configure $inner r6 -resize expand
 }
 

trunk/gui/scripts/transferfunctioneditor.tcl

@@ -127 +127 @@
     set _labels($name) [$_canvas create text 0 $h \
                             -anchor n -fill white -font "Helvetica 8" \
-                            -tags "$this $_name" -state $state]
+                            -tags "labels $this $_name" -state $state]
     set _id2name($_ticks($name)) $name
     $_canvas bind $_ticks($name) <Enter> [itcl::code $this EnterTick $name]

trunk/gui/scripts/vtkvolumeviewer.tcl

@@ -64 +64 @@
     public method updateTransferFunctions {}
 
+    private method BuildViewTab {}
     private method BuildVolumeComponents {}
     private method ComputeAlphamap { cname } 
@@ -246 +247 @@
         axisGridZ               0
         axisLabels              1
+        background              black
         cutplaneEdges           0
         cutplaneLighting        1
@@ -367 +369 @@
 
     if { [catch {
+        BuildViewTab
         BuildVolumeTab
         BuildCutplaneTab
@@ -1021 +1024 @@
         }
         DoRotate
-        InitSettings axisGridX axisGridY axisGridZ axisFlyMode \
+        InitSettings background axisGridX axisGridY axisGridZ axisFlyMode \
             axesVisible axisLabels
         PanCamera
@@ -1376 +1379 @@
     }
     switch -- $what {
+        "background" {
+            set bgcolor [$itk_component(background) value]
+            array set fgcolors {
+                "black" "white"
+                "white" "black"
+                "grey"  "black"
+            }
+            configure -plotbackground $bgcolor \
+                -plotforeground $fgcolors($bgcolor)
+            $itk_component(view) delete "legend"
+            DrawLegend
+        }
         "volumeVisible" {
             set bool $_settings(volumeVisible)
@@ -1614 +1629 @@
 itcl::configbody Rappture::VtkVolumeViewer::plotbackground {
     if { [isconnected] } {
-        foreach {r g b} [Color2RGB $itk_option(-plotbackground)] break
-        SendCmd "screen bgcolor $r $g $b"
+        set color $itk_option(-plotbackground)
+        set rgb [Color2RGB $color]
+        SendCmd "screen bgcolor $rgb"
+        $itk_component(legend) configure -background $color
     }
 }
@@ -1624 +1641 @@
 itcl::configbody Rappture::VtkVolumeViewer::plotforeground {
     if { [isconnected] } {
-        foreach {r g b} [Color2RGB $itk_option(-plotforeground)] break
-        #fix this!
-        #SendCmd "color background $r $g $b"
-    }
+        set color $itk_option(-plotforeground)
+        set rgb [Color2RGB $color]
+        SendCmd "axis color all $rgb"
+        SendCmd "outline color $rgb"
+        SendCmd "cutplane color $rgb"
+        $itk_component(legend) itemconfigure labels -fill $color 
+        $itk_component(legend) itemconfigure limits -fill $color 
+    }
+}
+
+itcl::body Rappture::VtkVolumeViewer::BuildViewTab {} {
+    foreach { key value } {
+        grid            0
+        axes            1
+        outline         0
+        volume          1
+        legend          1
+        particles       1
+        lic             1
+    } {
+        set _settings($this-$key) $value
+    }
+
+    set fg [option get $itk_component(hull) font Font]
+    #set bfg [option get $itk_component(hull) boldFont Font]
+
+    set inner [$itk_component(main) insert end \
+        -title "View Settings" \
+        -icon [Rappture::icon wrench]]
+    $inner configure -borderwidth 4
+
+    checkbutton $inner.axes \
+        -text "Axes" \
+        -variable [itcl::scope _settings(axesVisible)] \
+        -command [itcl::code $this AdjustSetting axesVisible] \
+        -font "Arial 9"
+
+    checkbutton $inner.outline \
+        -text "Outline" \
+        -variable [itcl::scope _settings(outline)] \
+        -command [itcl::code $this AdjustSetting outline] \
+        -font "Arial 9"
+
+    checkbutton $inner.legend \
+        -text "Legend" \
+        -variable [itcl::scope _settings(legendVisible)] \
+        -command [itcl::code $this AdjustSetting legendVisible] \
+        -font "Arial 9"
+
+    checkbutton $inner.volume \
+        -text "Volume" \
+        -variable [itcl::scope _settings(volumeVisible)] \
+        -command [itcl::code $this AdjustSetting volumeVisible] \
+        -font "Arial 9"
+
+    label $inner.background_l -text "Background" -font "Arial 9" 
+    itk_component add background {
+        Rappture::Combobox $inner.background -width 10 -editable no
+    }
+    $inner.background choices insert end \
+        "black"              "black"            \
+        "white"              "white"            \
+        "grey"               "grey"             
+
+    $itk_component(background) value $_settings(background)
+    bind $inner.background <<Value>> [itcl::code $this AdjustSetting background]
+
+    blt::table $inner \
+        0,0 $inner.axes  -cspan 2 -anchor w \
+        1,0 $inner.outline  -cspan 2 -anchor w \
+        2,0 $inner.volume  -cspan 2 -anchor w \
+        3,0 $inner.legend  -cspan 2 -anchor w \
+        4,0 $inner.background_l       -anchor e -pady 2 \
+        4,1 $inner.background                   -fill x \
+
+    blt::table configure $inner r* -resize none
+    blt::table configure $inner r5 -resize expand
 }