From: <ro...@us...> - 2008-05-07 14:23:50
|
Revision: 1531 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1531&view=rev Author: ron-fox Date: 2008-05-07 07:23:47 -0700 (Wed, 07 May 2008) Log Message: ----------- Fix defect in receiving gates from m2 spectra. The final or gate was being unconditionally added needed to add or modify depending on whether it's new or existing. Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/SpecTcl/XamineEventHandler.cpp Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2008-04-22 13:08:33 UTC (rev 1530) +++ trunk/SpecTcl/CHANGELOG 2008-05-07 14:23:47 UTC (rev 1531) @@ -789,3 +789,9 @@ April 22, 2008 - Fix slight errors in binning in SpecTcl.. correctly compute the bin width for the integeristas. Per Thomas Baumann. +May 7, 2008 - Fix defect in Xamine gate acceptor on m2 spectra. + Needed to select appropriately between adding the gate + and modifying the existing gate, rather than unconditionally + adding the gate.. which can throw an uncaught exception. + Thanks to Kevin Carnes KSU for stepping into this defect + and alerting me to it. Modified: trunk/SpecTcl/SpecTcl/XamineEventHandler.cpp =================================================================== --- trunk/SpecTcl/SpecTcl/XamineEventHandler.cpp 2008-04-22 13:08:33 UTC (rev 1530) +++ trunk/SpecTcl/SpecTcl/XamineEventHandler.cpp 2008-05-07 14:23:47 UTC (rev 1531) @@ -598,13 +598,21 @@ xId, yId); CGate* pGate = api.CreateGate(componentGateType, gateParams, points); + api.AddGate(componentName, pGate); + componentNames.push_back(componentName); } // Now create the or gate: CGate* orGate = api.CreateOrGate(componentNames); - api.AddGate(gatename, orGate); + + if (api.FindGate(gatename)) { + api.ReplaceGate(gatename, *orGate); + } + else { + api.AddGate(gatename, orGate); + } } // Create a unique component name for a component of a // gate accepted on a sum spectrum. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2008-05-07 14:26:56
|
Revision: 1532 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1532&view=rev Author: ron-fox Date: 2008-05-07 07:26:38 -0700 (Wed, 07 May 2008) Log Message: ----------- Added Kevin Carnes and Dirk Weisshaar to the acknowledgements. Modified Paths: -------------- trunk/SpecTcl/CHANGELOG trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2008-05-07 14:23:47 UTC (rev 1531) +++ trunk/SpecTcl/CHANGELOG 2008-05-07 14:26:38 UTC (rev 1532) @@ -795,3 +795,5 @@ adding the gate.. which can throw an uncaught exception. Thanks to Kevin Carnes KSU for stepping into this defect and alerting me to it. + - Added Kevin Carnes and Dirk Weisshaar to the acknowledgements. + Modified: trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp =================================================================== --- trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp 2008-05-07 14:23:47 UTC (rev 1531) +++ trunk/SpecTcl/SpecTcl/TclGrammerApp.cpp 2008-05-07 14:26:38 UTC (rev 1532) @@ -669,6 +669,9 @@ cerr << " - Leilehau Maly and Tony Denault of the NASA IRTF Telescope\n"; cerr << " for the gaussian fit harnesses to the gsl: fitgsl.{c,h}\n"; cerr << " - Emmanuel Frecon Swedish Institute of Computer Science for the splash package\n"; + cerr << " - Kevin Carnes James R. Macdonald Laboratory Kansas State University\n"; + cerr << " for many good functionality suggestions and for catching some of my stupidities\n"; + cerr << " - Dirk Weisshaar NSCL for many suggestions for performance and functional improvements\n"; cerr << " If your name should be on this list and is not, my apologies, please contact\n"; cerr << " fo...@ns... and let me know what your contribution was and I will add you to\n"; cerr << " the list of credits.\n"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ro...@us...> - 2008-07-11 19:25:30
|
Revision: 1543 http://nsclspectcl.svn.sourceforge.net/nsclspectcl/?rev=1543&view=rev Author: ron-fox Date: 2008-07-11 12:25:37 -0700 (Fri, 11 Jul 2008) Log Message: ----------- Expose the tree view browser to clients of the gui browser megawidget. Modified Paths: -------------- trunk/SpecTcl/Analysis/BufferAnalysis.h trunk/SpecTcl/CHANGELOG trunk/SpecTcl/Gui/browser.tcl Modified: trunk/SpecTcl/Analysis/BufferAnalysis.h =================================================================== --- trunk/SpecTcl/Analysis/BufferAnalysis.h 2008-07-11 18:53:12 UTC (rev 1542) +++ trunk/SpecTcl/Analysis/BufferAnalysis.h 2008-07-11 19:25:37 UTC (rev 1543) @@ -39,7 +39,7 @@ unsigned long LastIncrement(unsigned int n); /*!< increment for a channel */ float Total(unsigned int n); /*!< Totals for a channel */ long LastIntervalStart(); /*!< scaler interval start time */ - long LastIntevalEnd(); /*!< Scaler interval end time */ + long LastIntervalEnd(); /*!< Scaler interval end time */ const char* Title(); /*!< Run title. */ unsigned int RunNumber(); /*!< Number of current run */ const char* RunStartTime(); /*!< When the run started. */ Modified: trunk/SpecTcl/CHANGELOG =================================================================== --- trunk/SpecTcl/CHANGELOG 2008-07-11 18:53:12 UTC (rev 1542) +++ trunk/SpecTcl/CHANGELOG 2008-07-11 19:25:37 UTC (rev 1543) @@ -800,3 +800,5 @@ July 11, 2008 - Gui/slice.tcl - re-init the browser on accepting a gate (reinit member) that restores the parameters used to the list. + - Expose the treeview interface to clients of + Gui/browser.tcl \ No newline at end of file Modified: trunk/SpecTcl/Gui/browser.tcl =================================================================== --- trunk/SpecTcl/Gui/browser.tcl 2008-07-11 18:53:12 UTC (rev 1542) +++ trunk/SpecTcl/Gui/browser.tcl 2008-07-11 19:25:37 UTC (rev 1543) @@ -125,6 +125,9 @@ option -width 8in option -treewidth 2.5in + delegate option * to tree + delegate method * to tree + constructor {args} { $self configurelist $args @@ -133,7 +136,7 @@ - ::blt::treeview $win.tree + install tree using ::blt::treeview $win.tree $win.tree configure -autocreate 1 -hideroot 1 -separator . -width $options(-width)tree $win.tree sort auto 1 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |