Changeset 321 for trunk/addcmds.tcl

Timestamp:

Dec 4, 2009 5:04:06 PM (13 years ago)

Author:

toby

Message:

# on 2000/10/12 21:35:45, toby did:
Add www help support
implement optional EXPTOOL output

File:

• trunk/addcmds.tcl (modified) (17 diffs, 3 props)

trunk/addcmds.tcl

@@ -24 +24 @@
     catch {destroy $np}
     toplevel $np
+    bind $np <Key-F1> "MakeWWWHelp expgui2.html addphase"
 
     grid [label $np.l1 -text "Adding phase #$nextphase"] \
@@ -51 +52 @@
             -command "destroy $np"] -column 3 -row 3
     grid columnconfig $np.bf 4 -weight 1
+    grid [button $np.bf.help -text Help -bg yellow \
+            -command "MakeWWWHelp expgui2.html addphase"] \
+            -column 4 -row 3
 
     # get the input formats if not already defined
@@ -189 +193 @@
         set errmsg $out
     }
-    ShowBigMessage \
-                 $np \
-                 "Please review the result from adding the phase" \
-                 $errmsg
+    if {$expgui(showexptool)} {
+        ShowBigMessage \
+                $np \
+                "Please review the result from adding the phase" \
+                $errmsg
+    }
     file delete exptool.in exptool.out
     # now select the new phase
@@ -207 +213 @@
     catch {destroy $np}
     toplevel $np
+    bind $np <Key-F1> "MakeWWWHelp expgui3.html AddHist"
 
     grid [label $np.l0 -text "Adding new histogram"] \
@@ -238 +245 @@
             -value 1] -column 2 -row 6 -sticky w
     
-    grid [frame $np.f6] -column 1 -row 7 -columnspan 3
+    grid [frame $np.f6] -column 0 -row 7 -columnspan 5 -sticky ew 
     grid [button $np.f6.b6a -text Add \
             -command "addhist $np"] -column 0 -row 0
@@ -244 +251 @@
     grid [button $np.f6.b6b -text Cancel \
             -command "destroy $np"] -column 1 -row 0
+    grid [button $np.f6.help -text Help -bg yellow \
+            -command "MakeWWWHelp expgui3.html AddHist"] \
+            -column 2 -row 0 -sticky e
+    grid columnconfigure $np.f6 2 -weight 1
 
     grid [button $np.f6a -text "Run\nRAWPLOT" -command RunRawplot] \
@@ -594 +605 @@
 
     if {$err != ""} {
-        tk_dialog .phaseerr "Add Histogram Error" \
-                "The following error(s) were found in your input:\n$err" \
-                error 0 "OK" 
+#       tk_dialog .phaseerr "Add Histogram Error" \
+#               "The following error(s) were found in your input:\n$err" \
+#               error 0 "OK" 
+        MyMessageBox -parent $np -title  "Add Histogram Error" \
+                -message "The following error(s) were found in your input:\n$err" \
+                -icon error -type ok -default ok \
+                -helplink "expgui3.html AddHistErr"
         return
     }
@@ -648 +663 @@
         set errmsg $out
     }
-    ShowBigMessage \
-                 $np \
-                 "Please review the result from adding the phase" \
-                 $errmsg
+    if {$expgui(showexptool)} {
+        ShowBigMessage \
+                $np \
+                "Please review the result from adding the phase" \
+                $errmsg
+    }
     file delete exptool.in exptool.out
 }
@@ -686 +703 @@
     catch {destroy $top}
     toplevel $top
+    bind $top <Key-F1> "MakeWWWHelp expgui2.html addatoms"
 
     grid [label $top.l1 -relief groove -bd 4 -anchor center\
@@ -691 +709 @@
             -column 0 -row 0 \
             -sticky we -columnspan 10
-#    grid [label $top.l2 -text "Phase title:"] -column 0 -row 1 
     
     grid [canvas $top.canvas \
@@ -735 +752 @@
     grid [button $top.b2 -text Cancel \
             -command "destroy $top"] -column 1 -row 5 -sticky w
+    grid [button $top.help -text Help -bg yellow \
+            -command "MakeWWWHelp expgui2.html addatoms"] \
+            -column 0 -columnspan 2 -row 4
 
     # get the input formats if not already defined
@@ -895 +915 @@
         set errmsg $out
     }
-    ShowBigMessage \
-                 $top \
-                 "Please review the result from adding the atom(s)" \
-                 $errmsg
+    if {$expgui(showexptool)} {
+        ShowBigMessage \
+                $top \
+                "Please review the result from adding the atom(s)" \
+                $errmsg
+    }
     file delete exptool.in exptool.out
 }
@@ -928 +950 @@
     toplevel $w
     wm title $w "Edit Atomic Parameter -- phase #$phase"
+    bind $w <Key-F1> "MakeWWWHelp expgui2.html xform"
     # this needs to track by phase
     grid [label $w.0 \
@@ -1008 +1031 @@
 
     grid rowconfigure $w 9 -minsize 5
-    grid [frame $w.b] -row 10 -column 0
-    pack [button $w.b.3 -text Close -command "destroy $w"] -side left
+    grid [frame $w.b] -row 10 -column 0 -columnspan 10 -sticky ew
+    pack [button $w.b.3 -text Close -command "destroy $w"] -side left \
+            -padx 5 -pady 5
+    pack [button $w.b.help -text Help -bg yellow \
+            -command "MakeWWWHelp expgui2.html xform"] -side right \
+            -padx 5 -pady 5
     bind $w <Return> "destroy $w"
 
@@ -1217 +1244 @@
     catch {destroy $top}
     toplevel $top
+    bind $top <Key-F1> "MakeWWWHelp expgui2.html replacephase"
 
     grid [label $top.l1 -text "Replacing phase #$expgui(curPhase)" \
@@ -1258 +1286 @@
     grid [button $top.b2 -text Cancel \
             -command "destroy $top"] -column 1 -row 6 -sticky w
+    grid [button $top.help -text Help -bg yellow \
+            -command "MakeWWWHelp expgui2.html replacephase"] \
+            -column 2 -row 6
 
     # get the input formats if not already defined
@@ -1542 +1573 @@
     }
     donewait 
-    ShowBigMessage \
-                 $top \
-                 "Please review the result from adding the atom(s)" \
-                 $errmsg
+    if {$expgui(showexptool)} {
+        ShowBigMessage \
+                $top \
+                "Please review the result from adding the atom(s)" \
+                $errmsg
+    }
     file delete exptool.in exptool.out
     destroy $top