Changeset 199 for trunk

Timestamp:

Dec 4, 2009 5:02:03 PM (14 years ago)

Author:

toby

Message:

# on 2000/06/09 03:45:28, toby did:
Change Reload msg as per suggestions
add MD pref orientation pane
fix bug in non-BWidget implementation
make CompressList? survive use of strings
use -exportselection 0 for listboxes to avoid cut/paste conflicts

File:

• trunk/expgui (modified) (15 diffs, 3 props)

trunk/expgui

@@ -43 +43 @@
     set expgui(expfile) {}
 }
+
+set expgui(curhist) {}
+set expmap(powderlist) {}
 
 set expgui(debug) 0
@@ -131 +134 @@
 # commands for constraints
 source [file join $expgui(scriptdir) atomcons.tcl]
+# commands for preferred orientation
+source [file join $expgui(scriptdir) orient.tcl]
 #---------------------------------------------------------------------------
 # override options with locally defined values
@@ -218 +223 @@
     set expgui(last_History) [string range [string trim [lindex [exphistory last] 1]] 0 50 ]
     # set the window/icon title
-    wm title . $expfile
+    wm title . "EXPGUI $expfile"
     set expgui(titleunchanged) 1
     wm iconname . [file tail $expfile]
@@ -494 +499 @@
         append msg ".\n"
     }
-    append msg "Do you want to load the newer version or lose the modification by editing the current version?"
+    append msg "Do you want to use the newer (modified) version or continue with the older (previous) version of the file?"
+
     set w .ask
     catch {destroy $w}
@@ -516 +522 @@
             -default active -command "set expgui(dialogbutton) 0" \
             ] -side left -expand 1 -padx 3m -pady 2m
-    pack [button $w.bot.2 -text "Continue editing" \
+    pack [button $w.bot.2 -text "Continue with old" \
             -command "set expgui(dialogbutton) 1"] \
             -side left -expand 1 -padx 3m -pady 2m
@@ -950 +956 @@
     set flist {}
     set count 0
-    foreach num [lsort -integer $numberList] {
-        set next [expr $lastnum+1]
-        if {$num != $next} {
-            if {$count == 0 && $flist != ""} {
-                append flist ",$num"
-            } elseif {$count == 1 && $flist != ""} {
-                append flist ",$lastnum,$num"
-            } elseif {$flist != ""} {
-                append flist "-$lastnum,$num"
+    if [catch {set sortlist [lsort -integer $numberList]}] {return $numberList}
+    foreach num $sortlist {
+            set next [expr $lastnum+1]
+            if {$num != $next} {
+                if {$count == 0 && $flist != ""} {
+                    append flist ",$num"
+                } elseif {$count == 1 && $flist != ""} {
+                    append flist ",$lastnum,$num"
+                } elseif {$flist != ""} {
+                    append flist "-$lastnum,$num"
             } else {
                 append flist "$num"
@@ -2447 +2454 @@
             -createcmd MakeConstraintsPane]
     lappend expgui(frameactionlist) "consFrame DisplayConstraintsPane"
+
+    set expgui(orientFrame) [\
+            .n insert end prefPane -text "MD Pref Orient" \
+            -raisecmd "set expgui(pagenow) orientFrame; DisplayOrient"\
+            -createcmd MakeOrientPane]
+    lappend expgui(frameactionlist) "orientFrame DisplayOrient"
 } else {
     Notebook:create .n -pages {lsFrame phaseFrame histFrame fracFrame profFrame}
     pack .n -anchor w -fill both -expand yes
-    foreach item {lsFrame phaseFrame histFrame fracFrame profFrame} \
-            page {"LS Controls" Phase Histogram Scaling Profile } {
+    foreach item {lsFrame phaseFrame histFrame fracFrame profFrame \
+            orientFrame} \
+            page {"LS Controls" Phase Histogram Scaling Profile \
+            "MD Pref Orient"} {
         set expgui($item) [Notebook:frame .n $item]
         Notebook:pageconfig .n $item -command "InitPage $item" -title $page
@@ -2460 +2475 @@
     lappend expgui(frameactionlist) "fracFrame DisplayFrac"
     lappend expgui(frameactionlist) "profFrame DisplayProfile"
+    lappend expgui(frameactionlist) "orientFrame DisplayOrient"
     set expgui(GlobalModeAllDisable) {}
     lappend expgui(GlobalModeAllDisable) "histFrame {Notebook:pageconfig .n histFrame}"
@@ -2562 +2578 @@
     grid columnconfig $frameLatt  0 -weight 1
     #-------------- Begin Atom Coordinates Box  ------------------------------
-    grid [listbox   $fbig.title -height 1 -relief flat] \
+    grid [listbox  $fbig.title -height 1 -relief flat \
+            -exportselection 0] \
             -row 0 -column 0 -sticky ew
     set expgui(atomtitle) $fbig.title
     $expgui(atomtitle) configure -font $expgui(coordfont) -selectmode extended 
     grid [listbox   $fbig.lbox -height 10 \
+            -exportselection 0 \
             -xscrollcommand " $fbig.bscr set"\
             -yscrollcommand " $fbig.rscr set"\
@@ -2682 +2700 @@
     }
 }
-# make the phase pane
-MakePhasePane
 #-----------------------------------------------------------------------------
 proc MakeHistPane {} {
@@ -2695 +2711 @@
     grid rowconfigure $expgui(histFrame) 3 -weight 1
     grid [listbox $expgui(histFrame).hs.title -height 1 -relief flat \
+            -exportselection 0 \
             -font $expgui(histfont) ] -row 0 -column 0 -sticky ew
     grid [listbox $expgui(histFrame).hs.lbox -height 10 -width 25 \
+            -exportselection 0 \
             -font $expgui(histfont) \
             -xscrollcommand "$expgui(histFrame).hs.x set" \
@@ -2783 +2801 @@
     pack [frame $expgui(fracFrame).hs] -side left -expand y -fill both
     grid [listbox $expgui(fracFrame).hs.title -height 1 -relief flat \
+            -exportselection 0 \
             -font $expgui(histfont) ] -row 0 -column 0 -sticky ew
     grid [listbox $expgui(fracFrame).hs.lbox -height 10 -width 25 \
+            -exportselection 0 \
             -font $expgui(histfont) \
             -xscrollcommand "$expgui(fracFrame).hs.x set" \
@@ -2879 +2899 @@
     pack [frame $expgui(profFrame).hs] -side left -expand y -fill both
     grid [listbox $expgui(profFrame).hs.title -height 1 -relief flat \
+            -exportselection 0 \
             -font $expgui(histfont) ] -row 0 -column 0 -sticky ew
     grid [listbox $expgui(profFrame).hs.lbox -height 10 -width 25 \
+            -exportselection 0 \
             -font $expgui(histfont) \
             -xscrollcommand "$expgui(profFrame).hs.x set" \
@@ -2944 +2966 @@
 pack [frame $expgui(lsFrame).hs] -side left -expand y -fill both
 grid [listbox $expgui(lsFrame).hs.title -height 1 -relief flat \
+        -exportselection 0 \
         -font $expgui(histfont) ] -row 0 -column 0 -sticky ew
 grid [listbox $expgui(lsFrame).hs.lbox -height 10 -width 25 \
+        -exportselection 0 \
         -font $expgui(histfont) \
         -xscrollcommand "$expgui(lsFrame).hs.x set" \
@@ -3227 +3251 @@
 #^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ END OF MENU DEFINITION ^^^^^^^^^^^^^^^^^^^
 
+# make the phase pane
+MakePhasePane
+# and the rest of the windows w/o BWidget
+if !$expgui(haveBW) {
+    MakeHistPane
+    MakeScalingPane
+    MakeProfilePane
+}
 
 # handle indirect exits