Changeset 2748

Timestamp:

Dec 28, 2011 2:01:15 PM (13 years ago)

Author:

gah

Message:

 

Location:

branches/blt4/gui/scripts

Files:

• images/eps.png (added)
• images/font.png (added)
• images/gif.png (added)
• images/jpg.png (added)
• images/pdf.png (added)
• images/png.png (added)
• images/ps.png (added)
• molvisviewer.tcl (modified) (11 diffs)
• xyprint.tcl (modified) (16 diffs)

branches/blt4/gui/scripts/molvisviewer.tcl

@@ -27 +27 @@
         molvis_server Rappture::MolvisViewer::SetServerList
 }
+
+itk::usual ComboMenu {
+}
+itk::usual ComboEntry {
+}
+
 
 set debug 0
@@ -58 +64 @@
     private variable _model
     private variable _mlist
-    private variable _mrep "ballnstick"
+    private variable _mrep "ball and stick"
 
     private variable _imagecache
@@ -144 +150 @@
     private method StickRadius {option {models "all"} }
     private method OrthoProjection {option}
-    private method Representation { {option ""} }
+    private method ModelRepresentation { {option ""} }
     private method CartoonTrace {option {model "all"}}
     private method ComputeParallelepipedVertices { dataobj }
@@ -231 +237 @@
         $this-stickradius 0.14
         $this-cartoontrace no
-        $this-model     ballnstick
-        $this-modelimg  [Rappture::icon ballnstick]
+        $this-modelrep     "ball and stick"
         $this-opacity   1.0
         $this-ortho     no
@@ -320 +325 @@
         [itcl::code $this OrthoProjection toggle]
 
+    if { [catch {
     BuildSettingsTab
-
+    } errs] != 0 } {
+        global errorInfo
+        puts stderr "errs=$errs errorInfo=$errorInfo"
+    }
     # HACK ALERT. Initially force a requested width of the 3dview label. 
 
@@ -795 +804 @@
     $inner configure -borderwidth 4
 
-    label $inner.rep_l -text "Molecule Representation" \
+    blt::tk::label $inner.rep_l -text "Molecule Representation" \
         -font "Arial 9"
-
-    itk_component add representation {
-        Rappture::Combobox $inner.rep -width 20 -editable no
-    }
-    $inner.rep choices insert end \
-        "ballnstick"  "ball and stick" \
-        "spheres"     "spheres"         \
-        "sticks"      "sticks"          \
-        "lines"       "lines"           \
-        "cartoon"     "cartoon"         
-
-    bind $inner.rep <<Value>> [itcl::code $this Representation]
-    $inner.rep value "ball and stick"
+    set m $inner.rep.menu
+    blt::comboentry $inner.rep \
+        -width 2i \
+        -textvariable [itcl::scope _settings($this-modelrep)] \
+        -editable no -menu $m \
+        -command [itcl::code $this ModelRepresentation]
+    itk_component add modelrep {
+        blt::combomenu $m \
+            -xscrollbar $m.xs \
+            -yscrollbar $m.ys  \
+            -textvariable [itcl::scope _settings($this-modelrep)] \
+            -height { 0 2i } 
+    }
+    blt::tk::scrollbar $m.xs
+    blt::tk::scrollbar $m.ys
+    $m add -text "ball and stick" -value "ballnstick" \
+        -icon [Rappture::icon ballnstick]
+    $m add -text "spheres" -value "spheres" \
+        -icon [Rappture::icon spheres]
+    $m add -text "sticks" -value "sticks"  \
+        -icon [Rappture::icon lines]
+    $m add -text "lines" -value "lines"  \
+        -icon [Rappture::icon lines]
+    $m add -text "cartoon" -value "cartoon" \
+        -icon [Rappture::icon cartoon]
+    Rappture::Tooltip::for $inner.rep \
+        "Set the representation of the molecule."
+    $m select "ball and stick"
 
     scale $inner.spherescale -width 10 -font "Arial 9" \
@@ -1130 +1154 @@
         Cell update
         OrthoProjection update 
-        Representation update
+        ModelRepresentation update
     }
     set tab [$itk_component(main) panel "Settings"]
@@ -1210 +1234 @@
     set _view(c) $c 
     if { !$_rotatePending } {
-        $_dispatcher event -after 100 !rotate
+        $_dispatcher event -after 50 !rotate
         set _rotatePending 1
     }
@@ -1541 +1565 @@
 
 # ----------------------------------------------------------------------
-# USAGE: Representation spheres|ballnstick|lines|sticks
+# USAGE: ModelRepresentation spheres|ballnstick|lines|sticks
 #
 # Used internally to change the molecular representation used to render
 # our scene.
 # ----------------------------------------------------------------------
-itcl::body Rappture::MolvisViewer::Representation { { option "" } } {
+itcl::body Rappture::MolvisViewer::ModelRepresentation { { option "" } } {
     if { $option == "" } {
-        set value [$itk_component(representation) value]
-        set option [$itk_component(representation) translate $value]
+        set rep $_settings($this-modelrep)
+        if { [info exists itk_component(modelrep)] } {
+            set option [$itk_component(modelrep) item cget $rep -value]
+        }
     }
     if { $option == $_mrep } {
@@ -1558 +1584 @@
     }
     array unset _imagecache 
-    if { $option == "sticks" } {
-        set _settings($this-modelimg) [Rappture::icon lines]
-    }  else {
-        set _settings($this-modelimg) [Rappture::icon $option]
-    }
     set tab [$itk_component(main) panel "Settings"]
     set inner $tab.ss.frame
-    $inner.pict configure -image $_settings($this-modelimg)
 
     # Save the current option to set all radiobuttons -- just in case.
@@ -1580 +1600 @@
             }
         }
-    }
-    if { [isconnected] } {
-        SendCmd "representation -model $model $option"
-        #$_dispatcher event -idle !rebuild
+        if { [isconnected] } {
+            SendCmd "representation -model $model $option"
+        }
     }
 }

branches/blt4/gui/scripts/xyprint.tcl

@@ -39 +39 @@
     private variable _savedSettings;    # Array of settings.
     private variable _outputFormatType "";
+    private variable _formatIcon "";
 
     private common _oldSettingsFile "~/.rpsettings"
@@ -678 +679 @@
     set m $page.format.menu
     blt::comboentry $page.format \
-        -width 30 \
+        -width 1i \
         -textvariable [itcl::scope _settings($this-general-format)] \
         -editable no -menu $m \
+        -iconvariable [itcl::scope _formatIcon] \
         -command [itcl::code $this ApplyGeneralSettings]
     blt::combomenu $m \
@@ -686 +688 @@
         -yscrollbar $m.ys  \
         -textvariable [itcl::scope _settings($this-general-format)] \
+        -iconvariable [itcl::scope _formatIcon] \
         -height { 0 2i } 
     blt::tk::scrollbar $m.xs
     blt::tk::scrollbar $m.ys
-    $m add -value "pdf" -text "PDF Portable Document Format" 
-    $m add -value "ps"  -text "PS PostScript Format"  
-    $m add -value "eps" -text "EPS Encapsulated PostScript"  
-    $m add -value "jpg" -text "JPEG Joint Photographic Experts Group Format" 
-    $m add -value "png" -text "PNG Portable Network Graphics Format" 
-    $m add -value "gif" -text "GIF Graphics Interchange Format"
+    $m add -value "pdf" -text "PDF Portable Document Format"  \
+        -icon [Rappture::icon pdf]
+    $m add -value "ps"  -text "PS PostScript Format"  \
+        -icon [Rappture::icon ps]
+    $m add -value "eps" -text "EPS Encapsulated PostScript"  \
+        -icon [Rappture::icon eps]
+    $m add -value "jpg" -text "JPEG Joint Photographic Experts Group Format"  \
+        -icon [Rappture::icon jpg]
+    $m add -value "png" -text "PNG Portable Network Graphics Format"  \
+        -icon [Rappture::icon png]
+    $m add -value "gif" -text "GIF Graphics Interchange Format" \
+        -icon [Rappture::icon gif]
     Rappture::Tooltip::for $page.format_l "Set the format of the image."
 
@@ -700 +709 @@
     set m $page.style.menu
     blt::comboentry $page.style \
-        -width 30 \
+        -width 1i \
         -textvariable [itcl::scope _settings($this-general-style)] \
         -editable no -menu $m \
@@ -740 +749 @@
 }
     
-itcl::body Rappture::XyPrint::ApplyLegendSettings {} {
-    set page $itk_component(legend_page)
-    set _settings($this-legend-anchor)    [$page.anchor current]
-    if { $_clone != "" } {
-        lappend font $_settings($this-legend-fontfamily)
-        lappend font $_settings($this-legend-fontsize)
-        lappend font $_settings($this-legend-fontweight)
-        lappend font $_settings($this-legend-fontslant)
-        foreach option { -hide -position -anchor -borderwidth } {
-            SetComponentOption legend $option
-        }
-        $_clone legend configure -font fixed -font $font
-    }
-    ApplyElementSettings
-}
-
 itcl::body Rappture::XyPrint::BuildLegendTab {} {
     itk_component add legend_page {
@@ -875 +868 @@
         "Set the symbol of the current entry. \"none\" display no symbols."
 
-    label $page.font_l -text "font"
-    Rappture::Combobox $page.fontfamily -width 10 -editable no
-    $page.fontfamily choices insert end \
-        "courier" "courier" \
-        "helvetica" "helvetica"  \
-        "new*century*schoolbook"  "new century schoolbook" \
-        "symbol"  "symbol" \
-        "times"  "times"         
-    bind $page.fontfamily <<Value>> [itcl::code $this ApplyLegendSettings]
+    blt::tk::label $page.font_l -text "font"
+    set m $page.fontfamily.menu
+    blt::comboentry $page.fontfamily \
+        -width 1i \
+        -textvariable [itcl::scope _settings($this-legend-fontfamily)] \
+        -editable no -menu $m \
+        -command [itcl::code $this ApplyLegendSettings]
+    blt::combomenu $m \
+        -xscrollbar $m.xs \
+        -yscrollbar $m.ys  \
+        -textvariable [itcl::scope _settings($this-legend-fontfamily)] \
+        -height { 0 2i } 
+    blt::tk::scrollbar $m.xs
+    blt::tk::scrollbar $m.ys
+    $m style create "courier" -font "{courier new} 9"
+    $m style create "helvetica" -font "{arial} 9" 
+    $m style create "newcentury" -font "{new century schoolbook} 9"
+    $m style create "times" -font "{times new roman} 9"
+    $m add -text "courier" -value "courier" -style "courier"
+    $m add -text "helvetica" -value "helvetica"  -style "helvetica"
+    $m add -text "new century schoolbook" -value "new*century*schoolbook" \
+        -style "newcentury"
+    $m add -text "symbol" -value "symbol" 
+    $m add -text "times" -value "times" -style "times"
+    $m item configure all -icon [Rappture::icon font]
     Rappture::Tooltip::for $page.fontfamily \
         "Set the font of entries in the legend."
 
-    Rappture::Combobox $page.fontsize -width 4 -editable no
-    $page.fontsize choices insert end \
-        "8" "8" \
-        "9" "9" \
-        "10" "10" \
-        "11" "11" \
-        "12" "12" \
-        "14" "14" \
-        "17" "17" \
-        "18" "18" \
-        "20" "20" 
-    bind  $page.fontsize <<Value>> [itcl::code $this ApplyLegendSettings]
+    set m $page.fontsize.menu
+    blt::comboentry $page.fontsize \
+        -width 0.5i \
+        -textvariable [itcl::scope _settings($this-legend-fontsize)] \
+        -editable no -menu $m \
+        -command [itcl::code $this ApplyLegendSettings]
+    blt::combomenu $m \
+        -xscrollbar $m.xs \
+        -yscrollbar $m.ys  \
+        -textvariable [itcl::scope _settings($this-legend-fontsize)] \
+        -height { 0 2i } 
+    blt::tk::scrollbar $m.xs
+    blt::tk::scrollbar $m.ys
+    foreach size { "8" "9" "10" "11" "12" "14" "17" "18" "20" } {
+        $m add -text $size -value $size
+    }
     Rappture::Tooltip::for $page.fontsize \
-        "Set the size (points) of the font."
+        "Set the size (in points) of the legend font."
 
     blt::tk::pushbutton $page.fontweight \
@@ -1032 +1045 @@
     set m $page.tickfontfamily.menu
     blt::comboentry $page.tickfontfamily \
-        -width 10 \
+        -width 1i \
         -textvariable [itcl::scope _settings($this-axis-ticks-fontfamily)] \
         -editable no -menu $m \
@@ -1053 +1066 @@
     $m add -text "symbol" -value "symbol" 
     $m add -text "times" -value "times" -style "times"
-    $m item configure all \
-        -variable [itcl::scope _settings($this-axis-ticks-fontfamily)]
+    $m item configure all -icon [Rappture::icon font]
     Rappture::Tooltip::for $page.tickfontfamily \
         "Set the font of the ticks for the current axis."
 
-    if 0 {
-    label $page.tickfont_l -text "tick font"
-    Rappture::Combobox $page.tickfontfamily -width 10 -editable no
-    $page.tickfontfamily choices insert end \
-        "courier" "courier" \
-        "helvetica" "helvetica"  \
-        "new*century*schoolbook"  "new century schoolbook" \
-        "symbol"  "symbol" \
-        "times"  "times"         
-    bind $page.tickfontfamily <<Value>> [itcl::code $this ApplyAxisSettings]
-    Rappture::Tooltip::for $page.tickfontfamily \
-        "Set the font of the ticks for the current axis."
-    }
-    Rappture::Combobox $page.tickfontsize -width 4 -editable no
-    $page.tickfontsize choices insert end \
-        "8" "8" \
-        "9" "9" \
-        "10" "10" \
-        "11" "11" \
-        "12" "12" \
-        "14" "14" \
-        "17" "17" \
-        "18" "18" \
-        "20" "20" 
-    bind $page.tickfontsize <<Value>> [itcl::code $this ApplyAxisSettings]
+    set m $page.tickfontsize.menu
+    blt::comboentry $page.tickfontsize \
+        -width 0.5i \
+        -textvariable [itcl::scope _settings($this-axis-ticks-fontsize)] \
+        -editable no -menu $m \
+        -command [itcl::code $this ApplyLegendSettings]
+    blt::combomenu $m \
+        -xscrollbar $m.xs \
+        -yscrollbar $m.ys  \
+        -textvariable [itcl::scope _settings($this-axis-ticks-fontsize)] \
+        -height { 0 2i } 
+    blt::tk::scrollbar $m.xs
+    blt::tk::scrollbar $m.ys
+    foreach size { "8" "9" "10" "11" "12" "14" "17" "18" "20" } {
+        $m add -text $size -value $size
+    }
     Rappture::Tooltip::for $page.tickfontsize \
-        "Set the size (points) of the tick font."
+        "Set the size (in points) of the tick font."
 
     blt::tk::pushbutton $page.tickfontweight \
@@ -1106 +1109 @@
         "Use the italic version of the tick font."
 
-    label $page.titlefont_l -text "title font"
-    Rappture::Combobox $page.titlefontfamily -width 10 -editable no
-    $page.titlefontfamily choices insert end \
-        "courier" "courier" \
-        "helvetica" "helvetica"  \
-        "new*century*schoolbook"  "new century schoolbook" \
-        "symbol"  "symbol" \
-        "times"  "times"         
-    bind $page.titlefontfamily <<Value>> [itcl::code $this ApplyAxisSettings]
+    blt::tk::label $page.titlefont_l -text "title font"
+    set m $page.titlefontfamily.menu
+    blt::comboentry $page.titlefontfamily \
+        -width 1i \
+        -textvariable [itcl::scope _settings($this-axis-title-fontfamily)] \
+        -editable no -menu $m \
+        -command [itcl::code $this ApplyAxisSettings]
+    blt::combomenu $m \
+        -xscrollbar $m.xs \
+        -yscrollbar $m.ys  \
+        -textvariable [itcl::scope _settings($this-axis-title-fontfamily)] \
+        -height { 0 2i } 
+    blt::tk::scrollbar $m.xs
+    blt::tk::scrollbar $m.ys
+    $m style create "courier" -font "{courier new} 9"
+    $m style create "helvetica" -font "{arial} 9"
+    $m style create "newcentury" -font "{new century schoolbook} 9"
+    $m style create "times" -font "{times new roman} 9"
+    $m add -text "courier" -value "courier" -style "courier"
+    $m add -text "helvetica" -value "helvetica"  -style "helvetica"
+    $m add -text "new century schoolbook" -value "new*century*schoolbook" \
+        -style "newcentury"
+    $m add -text "symbol" -value "symbol" 
+    $m add -text "times" -value "times" -style "times"
+    $m item configure all -icon [Rappture::icon font]
     Rappture::Tooltip::for $page.titlefontfamily \
         "Set the font of the title for the current axis."
 
-    Rappture::Combobox $page.titlefontsize -width 4 -editable no
-    $page.titlefontsize choices insert end \
-        "8" "8" \
-        "9" "9" \
-        "10" "10" \
-        "11" "11" \
-        "12" "12" \
-        "14" "14" \
-        "17" "17" \
-        "18" "18" \
-        "20" "20" 
-    bind $page.titlefontsize <<Value>> [itcl::code $this ApplyAxisSettings]
+    set m $page.titlefontsize.menu
+    blt::comboentry $page.titlefontsize \
+        -width 0.5i \
+        -textvariable [itcl::scope _settings($this-axis-title-fontsize)] \
+        -editable no -menu $m \
+        -command [itcl::code $this ApplyLegendSettings]
+    blt::combomenu $m \
+        -xscrollbar $m.xs \
+        -yscrollbar $m.ys  \
+        -textvariable [itcl::scope _settings($this-axis-title-fontsize)] \
+        -height { 0 2i } 
+    blt::tk::scrollbar $m.xs
+    blt::tk::scrollbar $m.ys
+    foreach size { "8" "9" "10" "11" "12" "14" "17" "18" "20" } {
+        $m add -text $size -value $size
+    }
     Rappture::Tooltip::for $page.titlefontsize \
-        "Set the size (point) of the title font."
+        "Set the size (in points) of the title font."
 
     blt::tk::pushbutton $page.titlefontweight \
@@ -1193 +1216 @@
 itcl::body Rappture::XyPrint::ApplyLegendSettings {} {
     set page $itk_component(legend_page)
+
     set _settings($this-legend-position)  [$page.position current]
     set _settings($this-legend-anchor)    [$page.anchor current]
-    
     foreach option { -hide -position -anchor -borderwidth } {
         SetComponentOption legend $option
     }
-    set _settings($this-legend-fontfamily)  [$page.fontfamily value]
-    set _settings($this-legend-fontsize)    [$page.fontsize value]
     lappend font $_settings($this-legend-fontfamily)
     lappend font $_settings($this-legend-fontsize)
@@ -1206 +1227 @@
     lappend font $_settings($this-legend-fontslant)
     $_clone legend configure -font fixed -font $font
+
+    # Set the font of the comboentry to the selected legend font.
+    set m $page.fontfamily.menu
+    set style [$m item cget $_settings($this-legend-fontfamily) -style]
+    set font [$m style cget $style -font]
+    $page.fontfamily configure -font $font
     ApplyElementSettings
 }
@@ -1217 +1244 @@
         SetNamedComponentOption axis $axis $option
     }
-    #set _settings($this-axis-ticks-fontfamily)  [$page.tickfontfamily value]
-    #set _settings($this-axis-ticks-fontfamily) $_settings($this-$axis-ticks-fontfamily)  
-    set _settings($this-axis-ticks-fontsize)    [$page.tickfontsize value]
-    set _settings($this-axis-title-fontfamily)  [$page.titlefontfamily value]
-    set _settings($this-axis-title-fontsize)    [$page.titlefontsize value]
-
     set tickfont {}
     set titlefont {}
@@ -1236 +1257 @@
         lappend titlefont $_settings(${general}-${attr})
     }
-    set style [$page.tickfontfamily.menu item cget \
-               $_settings($this-axis-ticks-fontfamily) -style]
-    set font [$page.tickfontfamily.menu style cget $style -font]
+    # Set the font of the comboentry to the selected tick font.
+    set m $page.tickfontfamily.menu
+    set style [$m item cget $_settings($this-axis-ticks-fontfamily) -style]
+    set font [$m style cget $style -font]
     $page.tickfontfamily configure -font $font
+
+    # Set the font of the comboentry to the selected title font.
+    set m $page.titlefontfamily.menu
+    set style [$m item cget $_settings($this-axis-title-fontfamily) -style]
+    set font [$m style cget $style -font]
+    $page.titlefontfamily configure -font $font
 
     $_clone axis configure $axis -tickfont $tickfont -titlefont $titlefont
     $_clone marker configure ${type}-zero -hide $_settings($this-axis-zero)
-    #GetAxis
+
     RegeneratePreview
 }
@@ -1291 +1319 @@
 itcl::body Rappture::XyPrint::InitializeSettings {} {
     # General settings
+    set page $itk_component(graph_page)
 
     # Always set to "jpg" "ieee"
     set _settings($this-general-format)   \
         "JPEG Joint Photographic Experts Group Format" 
+    $page.format.menu select "JPEG Joint Photographic Experts Group Format" 
     set _settings($this-general-style)    ieee
     set _settings($this-general-remember) 0
-    set page $itk_component(graph_page)
 
     # Layout settings
@@ -1324 +1353 @@
     set _settings($this-legend-borderwidth) 0
 
-    $page.fontfamily value $_settings($this-legend-fontfamily)
-    $page.fontsize value $_settings($this-legend-fontsize)
     if { $_settings($this-legend-fontweight) == "bold" } {
         set _settings($this-legend-font-bold) 1
@@ -1351 +1378 @@
     }
     set axis [lindex $names 0]
-
-    $page.titlefontfamily value $_settings($this-$axis-title-fontfamily)
-    $page.titlefontsize value   $_settings($this-$axis-title-fontsize)
-    #set _settings($this-axis-ticks-fontfamily) $_settings($this-$axis-ticks-fontfamily)
-    $page.tickfontsize value    $_settings($this-$axis-ticks-fontsize)
 
     # Always hide the zero line.