Changeset 4550 for branches/1.3/gui/scripts/nanovisviewer.tcl

Timestamp:

Jul 17, 2014 8:12:29 PM (10 years ago)

Author:

ldelgass

Message:

merge background settings from trunk

Location:

branches/1.3

Files:

• . (modified) (1 prop)
• gui/scripts/nanovisviewer.tcl (modified) (7 diffs)

branches/1.3/gui/scripts/nanovisviewer.tcl

@@ -222 +222 @@
     array set _settings {
         -axesvisible       1
+        -background        black
         -colormap          default
         -cutplanesvisible  0
@@ -1236 +1237 @@
             }
         }
+        "-background" {
+            set bgcolor [$itk_component(background) value]
+            array set fgcolors {
+                "black" "white"
+                "white" "black"
+                "grey"  "black"
+            }
+            configure -plotbackground $bgcolor \
+                -plotforeground $fgcolors($bgcolor)
+            DrawLegend $_current
+        }
         "-gridvisible" {
             SendCmd "grid visible $_settings($what)"
@@ -1449 +1461 @@
 itcl::configbody Rappture::NanovisViewer::plotbackground {
     if { [isconnected] } {
-        foreach {r g b} [Color2RGB $itk_option(-plotbackground)] break
-        #fix this!
-        #SendCmd "color background $r $g $b"
+        set color $itk_option(-plotbackground)
+        set rgb [Color2RGB $color]
+        SendCmd "screen bgcolor $rgb"
+        $itk_component(legend) configure -background $color
     }
 }
@@ -1460 +1473 @@
 itcl::configbody Rappture::NanovisViewer::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 "volume outline color $rgb"
+        SendCmd "grid axiscolor $rgb"
+        SendCmd "grid linecolor $rgb"
+        $itk_component(legend) itemconfigure labels -fill $color 
+        $itk_component(legend) itemconfigure limits -fill $color 
     }
 }
@@ -1621 +1638 @@
         -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 \
@@ -1626 +1655 @@
         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 {
@@ -1632 +1663 @@
     }
     blt::table configure $inner r* -resize none
-    blt::table configure $inner r5 -resize expand
+    blt::table configure $inner r6 -resize expand
 }