Menu
▾
▴
[Nsclspectcl-cvscommits] SF.net SVN: nsclspectcl: [1503] trunk/SpecTcl
|
From: <ro...@us...> - 2008-03-12 18:19:49
|
Revision: 1503
http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1503&view=rev
Author: ron-fox
Date: 2008-03-12 11:19:56 -0700 (Wed, 12 Mar 2008)
Log Message:
-----------
Cosmetic changes to the guis.
Modified Paths:
--------------
trunk/SpecTcl/CHANGELOG
trunk/SpecTcl/Gui/fileMenu.html
trunk/SpecTcl/Gui/newGui.tcl
trunk/SpecTcl/SpecTcl/CFoldCommand.h
trunk/SpecTcl/TreeParam/SpecTclGui.tcl
Modified: trunk/SpecTcl/CHANGELOG
===================================================================
--- trunk/SpecTcl/CHANGELOG 2008-02-25 19:15:29 UTC (rev 1502)
+++ trunk/SpecTcl/CHANGELOG 2008-03-12 18:19:56 UTC (rev 1503)
@@ -757,4 +757,5 @@
dialog, explicitly set the search mask to the dirname of the mask with
*.win appended. lesstif has the tendency to store the selected file
in the filter path.
-
+March 12, 2008 - Cosmetic changes to folder gui file menu and the prompter for the
+ which gui to use dialog.
Modified: trunk/SpecTcl/Gui/fileMenu.html
===================================================================
--- trunk/SpecTcl/Gui/fileMenu.html 2008-02-25 19:15:29 UTC (rev 1502)
+++ trunk/SpecTcl/Gui/fileMenu.html 2008-03-12 18:19:56 UTC (rev 1503)
@@ -53,7 +53,7 @@
in listbox order to the file you selected. Spectra are written using the swrite <em>-format ascii</em>
command. A spectrum file can be read in using the File->Read Spectrum File... command.</p>
<br><br><a href="#top">Top</a>
- <h3>Restore...</h3>
+ <h3>Load...</h3>
<p>The File->Restore... command allows you to choose a saved spectrum script and
execute it to restore the state of analysis.</p>
<br><br><a href="#top">Top</a>
Modified: trunk/SpecTcl/Gui/newGui.tcl
===================================================================
--- trunk/SpecTcl/Gui/newGui.tcl 2008-02-25 19:15:29 UTC (rev 1502)
+++ trunk/SpecTcl/Gui/newGui.tcl 2008-03-12 18:19:56 UTC (rev 1503)
@@ -927,7 +927,7 @@
.topmenu.filemenu add command -label {Save TreeVariables...} -command writeVariables
.topmenu.filemenu add command -label {Save Contents of Spectra...} -command saveSeveralSpectra
.topmenu.filemenu add separator
- .topmenu.filemenu add command -label Restore... -command "restoreState; .gui.b update; .gui.b update"
+ .topmenu.filemenu add command -label Load... -command "restoreState; .gui.b update; .gui.b update"
.topmenu.filemenu add command -label {Read Spectrum File...} -command readSpectrumFile
.topmenu.filemenu add command -label {Source Tcl Script...} \
-command sourceScript
Modified: trunk/SpecTcl/SpecTcl/CFoldCommand.h
===================================================================
--- trunk/SpecTcl/SpecTcl/CFoldCommand.h 2008-02-25 19:15:29 UTC (rev 1502)
+++ trunk/SpecTcl/SpecTcl/CFoldCommand.h 2008-03-12 18:19:56 UTC (rev 1503)
@@ -29,12 +29,17 @@
class CSpectrum;
/**
- * Implements the fold command. The fold command has the following forms: fold -
- * apply gate spectrum ... Applies a gamma gate to a gamma spectrum as a fold.
- * fold -list ?pattern? For all gamma spectra that match pattern (* if omitted),
- * lists the spectra with folds and the folds applied to them in the form of a
- * list containing elements of the form {name fold}. fold -remove spectrum For the
- * gamma spectrum 'spectrum' removes the fold that is applied to it.
+ * Implements the fold command. The fold command has the following forms:
+\verbatim
+ fold -apply gate spectrum ... Applies a gamma gate to a gamma spectrum as a fold.
+ fold -list ?pattern? For all gamma spectra that match pattern (* if omitted),
+ lists the spectra with folds and the folds applied to
+ them in the form of a list containing elements of
+ the form {name fold}.
+ fold -remove spectrum For the
+ gamma spectrum 'spectrum' removes the fold that is
+ applied to it.
+\endverbatim
* @created 22-Apr-2005 12:54:15 PM
* @author Ron Fox
* @version 1.0
Modified: trunk/SpecTcl/TreeParam/SpecTclGui.tcl
===================================================================
--- trunk/SpecTcl/TreeParam/SpecTclGui.tcl 2008-02-25 19:15:29 UTC (rev 1502)
+++ trunk/SpecTcl/TreeParam/SpecTclGui.tcl 2008-03-12 18:19:56 UTC (rev 1503)
@@ -51,74 +51,76 @@
}
}
}
-set answer no; # In case we never prompt.
+set answer 0; # In case we never prompt.
if {![info exists NoPromptForNewGui] || (!$NoPromptForNewGui)} {
- set answer [tk_messageBox -icon question -type yesno -title "New Gui" \
- -message {This is the old SpecTcl GUI. If you want to use the new GUI, click "Yes" below}]
-}
-if {$answer == "yes"} {
- source $SpecTclHome/Script/newGui.tcl
-} else {
+ set answer [tk_dialog .newgui "New Gui" \
+ {This is the old SpecTcl GUI. If you want to use the new GUI, click "New (folder) otherwise click Old(multicolored)" below} \
+ questhead 0 "Old(multicolored)" "New(Folder)"]
- if {![info exist TreeParameterHome]} {
- set scriptname [info script]
- set scriptdir [file dirname $scriptname]
- set TreeParameterHome $scriptdir
+ if {$answer == 1} {
+ source $SpecTclHome/Script/newGui.tcl
}
+}
- source $TreeParameterHome/mclistbox.tcl
- source $TreeParameterHome/notebook.tcl
- source $TreeParameterHome/tabnbook.tcl
- source $TreeParameterHome/TreeParameter.tcl
-
- source $TreeParameterHome/SpectrumGenerator.tcl
-
- source $TreeParameterHome/ParameterManipulator.tcl
-
- source $TreeParameterHome/TreeVariable.tcl
-
- source $TreeParameterHome/VariableManipulator.tcl
-
- source $TreeParameterHome/GateGenerator.tcl
-
- CheckVersion
-
- CheckFiles
-
- GenerateMenuBitmaps
- puts "Building SpecTcl GUI ..."
- update
-
- set version [treeparameter -version]
-
- toplevel .gui
- wm title .gui "TreeParameter GUI version $version"
- tabnotebook_create .gui.main
- pack .gui.main -expand 1 -fill both
- SetupSpectrumGenerator .gui.main
- SetupParameterManipulator .gui.main
- SetupVariableManipulator .gui.main
- SetupGateGenerator .gui.main
- tabnotebook_display .gui.main Gates
- tabnotebook_display .gui.main Variables
- tabnotebook_display .gui.main Parameters
- tabnotebook_display .gui.main Spectra
- trace variable spectrumParameterX w SpectrumParameterXCommand
- trace variable spectrumParameterY w SpectrumParameterYCommand
- for {set i 1} {$i <= 20} {incr i} {
- trace variable parameter(Name$i) w "MenuLoadParameter $i"
- trace variable variable(Name$i) w "MenuLoadVariable $i"
- }
- foreach v [treevariable -list] {
- set vName [lindex [lindex $v 0] 0]
- trace variable $vName w SetChanged
- }
- global spectrumMask gateMask
- trace variable spectrumMask w DynamicSpectrumList
- trace variable gateMask w DynamicGateList
- puts "SpecTcl GUI loaded."
-
+if {![info exist TreeParameterHome]} {
+ set scriptname [info script]
+ set scriptdir [file dirname $scriptname]
+ set TreeParameterHome $scriptdir
}
+
+source $TreeParameterHome/mclistbox.tcl
+source $TreeParameterHome/notebook.tcl
+source $TreeParameterHome/tabnbook.tcl
+
+source $TreeParameterHome/TreeParameter.tcl
+
+source $TreeParameterHome/SpectrumGenerator.tcl
+
+source $TreeParameterHome/ParameterManipulator.tcl
+
+source $TreeParameterHome/TreeVariable.tcl
+
+source $TreeParameterHome/VariableManipulator.tcl
+
+source $TreeParameterHome/GateGenerator.tcl
+
+CheckVersion
+
+CheckFiles
+
+GenerateMenuBitmaps
+puts "Building SpecTcl GUI ..."
+update
+
+set version [treeparameter -version]
+
+toplevel .gui
+wm title .gui "TreeParameter GUI version $version"
+tabnotebook_create .gui.main
+pack .gui.main -expand 1 -fill both
+SetupSpectrumGenerator .gui.main
+SetupParameterManipulator .gui.main
+SetupVariableManipulator .gui.main
+SetupGateGenerator .gui.main
+tabnotebook_display .gui.main Gates
+tabnotebook_display .gui.main Variables
+tabnotebook_display .gui.main Parameters
+tabnotebook_display .gui.main Spectra
+trace variable spectrumParameterX w SpectrumParameterXCommand
+trace variable spectrumParameterY w SpectrumParameterYCommand
+for {set i 1} {$i <= 20} {incr i} {
+ trace variable parameter(Name$i) w "MenuLoadParameter $i"
+ trace variable variable(Name$i) w "MenuLoadVariable $i"
+}
+foreach v [treevariable -list] {
+ set vName [lindex [lindex $v 0] 0]
+ trace variable $vName w SetChanged
+}
+global spectrumMask gateMask
+trace variable spectrumMask w DynamicSpectrumList
+trace variable gateMask w DynamicGateList
+puts "SpecTcl GUI loaded."
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|