Menu
▾
▴
[Nsclspectcl-cvscommits] SpecTcl/SpecTcl SpectrumCommand.cpp,5.3,5.4 SpectrumCommand.h,5.2,5.3 SpectrumPackage.cpp,5.3,5.4 SpectrumPackage.h,5.2,5.3
|
From: Ron F. <ro...@us...> - 2006-02-21 19:31:11
|
Update of /cvsroot/nsclspectcl/SpecTcl/SpecTcl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23857/SpecTcl Modified Files: SpectrumCommand.cpp SpectrumCommand.h SpectrumPackage.cpp SpectrumPackage.h Log Message: Add -showgate to spectrum -list command/subcommand Index: SpectrumPackage.h =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/SpecTcl/SpectrumPackage.h,v retrieving revision 5.2 retrieving revision 5.3 diff -C2 -d -r5.2 -r5.3 *** SpectrumPackage.h 3 Jun 2005 15:19:28 -0000 5.2 --- SpectrumPackage.h 21 Feb 2006 19:30:59 -0000 5.3 *************** *** 295,298 **** --- 295,301 ---- // // $Log$ + // Revision 5.3 2006/02/21 19:30:59 ron-fox + // Add -showgate to spectrum -list command/subcommand + // // Revision 5.2 2005/06/03 15:19:28 ron-fox // Part of breaking off /merging branch to start 3.1 development *************** *** 455,461 **** // List Spectra ! void ListSpectra (STD(vector)<STD(string)>& rvProperties, const char* pattern) ; //Int_t ListSpectrum (CTCLResult& rResult, const char* pName) ; ! Int_t ListSpectrum (CTCLResult& rResult, UInt_t nId) ; // Clear Spectra: --- 458,466 ---- // List Spectra ! void ListSpectra (STD(vector)<STD(string)>& rvProperties, const char* pattern, ! bool showGates=false) ; //Int_t ListSpectrum (CTCLResult& rResult, const char* pName) ; ! Int_t ListSpectrum (CTCLResult& rResult, UInt_t nId, ! bool showGate=false) ; // Clear Spectra: *************** *** 504,508 **** protected: ! STD(string) DescribeSpectrum(CSpectrum& rSpectrum); UInt_t FindDisplayBinding(const STD(string)& rName); UInt_t FindDisplayBinding(UInt_t nId); --- 509,513 ---- protected: ! STD(string) DescribeSpectrum(CSpectrum& rSpectrum, bool showGate=false); UInt_t FindDisplayBinding(const STD(string)& rName); UInt_t FindDisplayBinding(UInt_t nId); Index: SpectrumPackage.cpp =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/SpecTcl/SpectrumPackage.cpp,v retrieving revision 5.3 retrieving revision 5.4 diff -C2 -d -r5.3 -r5.4 *** SpectrumPackage.cpp 22 Sep 2005 12:40:38 -0000 5.3 --- SpectrumPackage.cpp 21 Feb 2006 19:30:59 -0000 5.4 *************** *** 38,41 **** --- 38,44 ---- // // $Log$ + // Revision 5.4 2006/02/21 19:30:59 ron-fox + // Add -showgate to spectrum -list command/subcommand + // // Revision 5.3 2005/09/22 12:40:38 ron-fox // Port in the bitmask spectra *************** *** 307,332 **** return TCL_OK; } ! ////////////////////////////////////////////////////////////////////////// ! // ! // Function: ! // void ListSpectra ( std::vector<std::string> rvProperties ) ! // Operation Type: ! // Interface. ! // void ! CSpectrumPackage::ListSpectra(std::vector<std::string>& rvProperties, const char* pattern) { ! // Returns the set of spectrum definitions. Each ! // Spectrum's properties is stored in a string formatted as ! // a TCL List in the following format: ! // ! // id name dimensions { parameters...} {resolutions...} ! // ! // Formal Parameters: ! // ! // vector<std::string>& rvProperties ! // Vector which will be cleared and filled with the ! // set of definitions strings. ! // SpecTcl& api(*(SpecTcl::getInstance())); --- 310,336 ---- return TCL_OK; } ! /*! ! Returns the set of spectrum definitions. Each ! Spectrum's properties is stored in a string formatted as ! a TCL List in the following format: ! ! id name dimensions { parameters...} {resolutions...} ?gatename? ! ! ! \param vector<std::string>& rvProperties ! Vector which will be cleared and filled with the ! set of definitions strings. ! \param pattern (const char*) ! A pattern to match.. only spectra with glob matching against the ! pattern are listed. ! \param showGates : bool [false] ! If true, the gate name is also added to the listing. ! This is actually just passed to DescribSpectrum. ! */ void ! CSpectrumPackage::ListSpectra(std::vector<std::string>& rvProperties, ! const char* pattern, bool showGates) { ! SpecTcl& api(*(SpecTcl::getInstance())); *************** *** 339,343 **** { CSpectrum* rSpec((*p).second); ! rvProperties.push_back(DescribeSpectrum(*rSpec)); } } --- 343,347 ---- { CSpectrum* rSpec((*p).second); ! rvProperties.push_back(DescribeSpectrum(*rSpec, showGates)); } } *************** *** 345,375 **** ! ////////////////////////////////////////////////////////////////////////// ! // ! // Function: ! // Int_t ListSpectrum ( CTCLResult& rResult, UInt_t nId ) ! // Operation Type: ! // Interface ! // Int_t ! CSpectrumPackage::ListSpectrum(CTCLResult& rResult, UInt_t nId) { ! // Produces a string describing the selected ! // spectrum. The spectrum properties are given in ! // the form: ! // id name dimensions {parameterlist} {resolutionlist} ! // ! // Formal Parameters: ! // CTCLResult& rResult: ! // References the command result string. ! // UInt_t nId: ! // Identifier of the spectrum to describe. ! // Returns: ! // TCL_OK - If the spectrum properties ! // could be retrieved, then rResult ! // contains the property list. ! // TCL_ERROR - If there was a problem and then ! // rResult provides the details. SpecTcl& api(*(SpecTcl::getInstance())); --- 349,377 ---- + /*! + Produces a string describing the selected + spectrum. The spectrum properties are given in + the form: + id name dimensions {parameterlist} {resolutionlist} ?gatename? ! \param rResult CTCLResult& ! References the command result string. ! \param nId UInt_t ! Identifier of the spectrum to describe. ! \param showGate : bool [false] ! This is passeed on to DescribeSpectrum if true, the ! name of the gate on each spectrum is also provided. ! \return int ! \retval TCL_OK If the spectrum properties ! could be retrieved, then rResult ! contains the property list. ! \retval TCL_ERROR If there was a problem and then ! rResult provides the details. ! */ Int_t ! CSpectrumPackage::ListSpectrum(CTCLResult& rResult, UInt_t nId, ! bool showGates) { ! SpecTcl& api(*(SpecTcl::getInstance())); *************** *** 386,390 **** if(pSpec) { ! rResult += DescribeSpectrum(*pSpec); return TCL_OK; } --- 388,392 ---- if(pSpec) { ! rResult += DescribeSpectrum(*pSpec, showGates); return TCL_OK; } *************** *** 1551,1554 **** --- 1553,1560 ---- \param <tt> rSpectrum (CSpectrum& [in]): </tt> The spectrum to describe. + \param <tt>showGate (bool [in] default = false): </tt> + If true, an additional element is added to the spectrum + information that lists the name of the gate applied to the + spectrum. \retval std::string *************** *** 1556,1560 **** */ std::string ! CSpectrumPackage::DescribeSpectrum(CSpectrum& rSpectrum) { // Given a spectrum, describes it in standard form. --- 1562,1566 ---- */ std::string ! CSpectrumPackage::DescribeSpectrum(CSpectrum& rSpectrum, bool showGate) { // Given a spectrum, describes it in standard form. *************** *** 1609,1612 **** --- 1615,1625 ---- Description.AppendElement(DataTypeToText(Def.eDataType)); + // If requested, show the gate applied: + + if (showGate) { + const CGateContainer& g(*(rSpectrum.getGate())); + Description.AppendElement(g.getName()); + } + // Return the description string: Index: SpectrumCommand.cpp =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/SpecTcl/SpectrumCommand.cpp,v retrieving revision 5.3 retrieving revision 5.4 diff -C2 -d -r5.3 -r5.4 *** SpectrumCommand.cpp 22 Sep 2005 12:40:38 -0000 5.3 --- SpectrumCommand.cpp 21 Feb 2006 19:30:59 -0000 5.4 *************** *** 1,360 **** /* ! GNU GENERAL PUBLIC LICENSE ! Version 2, June 1991 ! ! Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Everyone is permitted to copy and distribute verbatim copies ! of this license document, but changing it is not allowed. ! ! Preamble ! ! The licenses for most software are designed to take away your ! freedom to share and change it. By contrast, the GNU General Public ! License is intended to guarantee your freedom to share and change free ! software--to make sure the software is free for all its users. This ! General Public License applies to most of the Free Software ! Foundation's software and to any other program whose authors commit to ! using it. (Some other Free Software Foundation software is covered by ! the GNU Library General Public License instead.) You can apply it to ! your programs, too. ! ! When we speak of free software, we are referring to freedom, not ! price. Our General Public Licenses are designed to make sure that you ! have the freedom to distribute copies of free software (and charge for ! this service if you wish), that you receive source code or can get it ! if you want it, that you can change the software or use pieces of it ! in new free programs; and that you know you can do these things. ! ! To protect your rights, we need to make restrictions that forbid ! anyone to deny you these rights or to ask you to surrender the rights. ! These restrictions translate to certain responsibilities for you if you ! distribute copies of the software, or if you modify it. ! ! For example, if you distribute copies of such a program, whether ! gratis or for a fee, you must give the recipients all the rights that ! you have. You must make sure that they, too, receive or can get the ! source code. And you must show them these terms so they know their ! rights. ! ! We protect your rights with two steps: (1) copyright the software, and ! (2) offer you this license which gives you legal permission to copy, ! distribute and/or modify the software. ! ! Also, for each author's protection and ours, we want to make certain ! that everyone understands that there is no warranty for this free ! software. If the software is modified by someone else and passed on, we ! want its recipients to know that what they have is not the original, so ! that any problems introduced by others will not reflect on the original ! authors' reputations. ! ! Finally, any free program is threatened constantly by software ! patents. We wish to avoid the danger that redistributors of a free ! program will individually obtain patent licenses, in effect making the ! program proprietary. To prevent this, we have made it clear that any ! patent must be licensed for everyone's free use or not licensed at all. ! ! The precise terms and conditions for copying, distribution and ! modification follow. ! ! GNU GENERAL PUBLIC LICENSE ! TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ! ! 0. This License applies to any program or other work which contains ! a notice placed by the copyright holder saying it may be distributed ! under the terms of this General Public License. The "Program", below, ! refers to any such program or work, and a "work based on the Program" ! means either the Program or any derivative work under copyright law: ! that is to say, a work containing the Program or a portion of it, ! either verbatim or with modifications and/or translated into another ! language. (Hereinafter, translation is included without limitation in ! the term "modification".) Each licensee is addressed as "you". ! ! Activities other than copying, distribution and modification are not ! covered by this License; they are outside its scope. The act of ! running the Program is not restricted, and the output from the Program ! is covered only if its contents constitute a work based on the ! Program (independent of having been made by running the Program). ! Whether that is true depends on what the Program does. ! ! 1. You may copy and distribute verbatim copies of the Program's ! source code as you receive it, in any medium, provided that you ! conspicuously and appropriately publish on each copy an appropriate ! copyright notice and disclaimer of warranty; keep intact all the ! notices that refer to this License and to the absence of any warranty; ! and give any other recipients of the Program a copy of this License ! along with the Program. ! ! You may charge a fee for the physical act of transferring a copy, and ! you may at your option offer warranty protection in exchange for a fee. ! ! 2. You may modify your copy or copies of the Program or any portion ! of it, thus forming a work based on the Program, and copy and ! distribute such modifications or work under the terms of Section 1 ! above, provided that you also meet all of these conditions: ! ! a) You must cause the modified files to carry prominent notices ! stating that you changed the files and the date of any change. ! ! b) You must cause any work that you distribute or publish, that in ! whole or in part contains or is derived from the Program or any ! part thereof, to be licensed as a whole at no charge to all third ! parties under the terms of this License. ! ! c) If the modified program normally reads commands interactively ! when run, you must cause it, when started running for such ! interactive use in the most ordinary way, to print or display an ! announcement including an appropriate copyright notice and a ! notice that there is no warranty (or else, saying that you provide ! a warranty) and that users may redistribute the program under ! these conditions, and telling the user how to view a copy of this ! License. (Exception: if the Program itself is interactive but ! does not normally print such an announcement, your work based on ! the Program is not required to print an announcement.) ! ! These requirements apply to the modified work as a whole. If ! identifiable sections of that work are not derived from the Program, ! and can be reasonably considered independent and separate works in ! themselves, then this License, and its terms, do not apply to those ! sections when you distribute them as separate works. But when you ! distribute the same sections as part of a whole which is a work based ! on the Program, the distribution of the whole must be on the terms of ! this License, whose permissions for other licensees extend to the ! entire whole, and thus to each and every part regardless of who wrote it. ! ! Thus, it is not the intent of this section to claim rights or contest ! your rights to work written entirely by you; rather, the intent is to ! exercise the right to control the distribution of derivative or ! collective works based on the Program. ! ! In addition, mere aggregation of another work not based on the Program ! with the Program (or with a work based on the Program) on a volume of ! a storage or distribution medium does not bring the other work under ! the scope of this License. ! ! 3. You may copy and distribute the Program (or a work based on it, ! under Section 2) in object code or executable form under the terms of ! Sections 1 and 2 above provided that you also do one of the following: ! ! a) Accompany it with the complete corresponding machine-readable ! source code, which must be distributed under the terms of Sections ! 1 and 2 above on a medium customarily used for software interchange; or, ! ! b) Accompany it with a written offer, valid for at least three ! years, to give any third party, for a charge no more than your ! cost of physically performing source distribution, a complete ! machine-readable copy of the corresponding source code, to be ! distributed under the terms of Sections 1 and 2 above on a medium ! customarily used for software interchange; or, ! ! c) Accompany it with the information you received as to the offer ! to distribute corresponding source code. (This alternative is ! allowed only for noncommercial distribution and only if you ! received the program in object code or executable form with such ! an offer, in accord with Subsection b above.) ! ! The source code for a work means the preferred form of the work for ! making modifications to it. For an executable work, complete source ! code means all the source code for all modules it contains, plus any ! associated interface definition files, plus the scripts used to ! control compilation and installation of the executable. However, as a ! special exception, the source code distributed need not include ! anything that is normally distributed (in either source or binary ! form) with the major components (compiler, kernel, and so on) of the ! operating system on which the executable runs, unless that component ! itself accompanies the executable. ! ! If distribution of executable or object code is made by offering ! access to copy from a designated place, then offering equivalent ! access to copy the source code from the same place counts as ! distribution of the source code, even though third parties are not ! compelled to copy the source along with the object code. ! ! 4. You may not copy, modify, sublicense, or distribute the Program ! except as expressly provided under this License. Any attempt ! otherwise to copy, modify, sublicense or distribute the Program is ! void, and will automatically terminate your rights under this License. ! However, parties who have received copies, or rights, from you under ! this License will not have their licenses terminated so long as such ! parties remain in full compliance. ! ! 5. You are not required to accept this License, since you have not ! signed it. However, nothing else grants you permission to modify or ! distribute the Program or its derivative works. These actions are ! prohibited by law if you do not accept this License. Therefore, by ! modifying or distributing the Program (or any work based on the ! Program), you indicate your acceptance of this License to do so, and ! all its terms and conditions for copying, distributing or modifying ! the Program or works based on it. ! ! 6. Each time you redistribute the Program (or any work based on the ! Program), the recipient automatically receives a license from the ! original licensor to copy, distribute or modify the Program subject to ! these terms and conditions. You may not impose any further ! restrictions on the recipients' exercise of the rights granted herein. ! You are not responsible for enforcing compliance by third parties to ! this License. ! ! 7. If, as a consequence of a court judgment or allegation of patent ! infringement or for any other reason (not limited to patent issues), ! conditions are imposed on you (whether by court order, agreement or ! otherwise) that contradict the conditions of this License, they do not ! excuse you from the conditions of this License. If you cannot ! distribute so as to satisfy simultaneously your obligations under this ! License and any other pertinent obligations, then as a consequence you ! may not distribute the Program at all. For example, if a patent ! license would not permit royalty-free redistribution of the Program by ! all those who receive copies directly or indirectly through you, then ! the only way you could satisfy both it and this License would be to ! refrain entirely from distribution of the Program. ! ! If any portion of this section is held invalid or unenforceable under ! any particular circumstance, the balance of the section is intended to ! apply and the section as a whole is intended to apply in other ! circumstances. ! ! It is not the purpose of this section to induce you to infringe any ! patents or other property right claims or to contest validity of any ! such claims; this section has the sole purpose of protecting the ! integrity of the free software distribution system, which is ! implemented by public license practices. Many people have made ! generous contributions to the wide range of software distributed ! through that system in reliance on consistent application of that ! system; it is up to the author/donor to decide if he or she is willing ! to distribute software through any other system and a licensee cannot ! impose that choice. ! ! This section is intended to make thoroughly clear what is believed to ! be a consequence of the rest of this License. ! ! 8. If the distribution and/or use of the Program is restricted in ! certain countries either by patents or by copyrighted interfaces, the ! original copyright holder who places the Program under this License ! may add an explicit geographical distribution limitation excluding ! those countries, so that distribution is permitted only in or among ! countries not thus excluded. In such case, this License incorporates ! the limitation as if written in the body of this License. ! ! 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. ! ! Each version is given a distinguishing version number. If the Program ! specifies a version number of this License which applies to it and "any ! later version", you have the option of following the terms and conditions ! either of that version or of any later version published by the Free Software ! Foundation. If the Program does not specify a version number of this License, ! you may choose any version ever published by the Free Software Foundation. ! ! 10. If you wish to incorporate parts of the Program into other free ! programs whose distribution conditions are different, write to the author to ! ask for permission. For software which is copyrighted by the Free Software ! Foundation, write to the Free Software Foundation; we sometimes make ! exceptions for this. Our decision will be guided by the two goals of ! preserving the free status of all derivatives of our free software and of ! promoting the sharing and reuse of software generally. ! ! NO WARRANTY ! 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR ! THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ! OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE ! THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, ! INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND ! FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND ! PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, ! YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. ! 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ! WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ! REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ! INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ! OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO ! LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR ! THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), ! EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH ! DAMAGES. ! END OF TERMS AND CONDITIONS ' */ ! static const char* Copyright = "(C) Copyright Michigan State University 2008, All rights reserved"; ! // CSpectrumCommand.cpp ! // Implements the spectrum TCL command. ! // This command has the following formats: ! // ! // spectrum [-new] name stype {parameterlist} {reslist} [dtype] ! // Creates a new spectrum. ! // spectrum -list [-byid] ! // List all spectra [sorted by id] ! // spectrum -list name ! // Lists a spectrum given the name. ! // spectrum -list -id nId ! // Lists a spectrum given it's id. ! // spectrum -delete namelist ! // spectrum -delete -id idlist ! // Deletes sets of spectra by id or name. ! // spectrum -delete -all ! // Deletes all spectra. ! // ! // Author: ! // Ron Fox ! // NSCL ! // Michigan State University ! // East Lansing, MI 48824-1321 ! // mailto:fo...@ns... ! // ! // Change log: ! // July 3, 1999 - Use CreateSpectrum, rather than ! // New1d, New2D etc. ! // ! // $Log$ ! // Revision 5.3 2005/09/22 12:40:38 ron-fox ! // Port in the bitmask spectra ! // ! // Revision 5.2 2005/06/03 15:19:28 ron-fox ! // Part of breaking off /merging branch to start 3.1 development ! // ! // Revision 5.1.2.4 2005/05/27 11:07:30 thoagland ! // Added support for pseudo, parameter, clear, apply, and bind to take an optional pattern for the -list switch. ! // ! // Revision 5.1.2.3 2005/05/24 11:36:48 thoagland ! // Added support for spectrum -list [-byid] [pattern] ! // ! // Revision 5.1.2.2 2005/05/11 16:56:07 thoagland ! // dded Support for StripChart Spectra ! // ! // Revision 5.1.2.1 2004/12/15 17:24:06 ron-fox ! // - Port to gcc/g++ 3.x ! // - Recast swrite/sread in terms of tcl[io]stream rather than ! // the kludgy thing I had done of decoding the channel fd. ! // This is both necessary due to g++ 3.x's runtime and ! // nicer too!. ! // ! // Revision 5.1 2004/11/29 16:56:12 ron-fox ! // Begin port to 3.x compilers calling this 3.0 ! // ! // Revision 4.5.2.2 2004/10/20 19:53:01 ron-fox ! // Fix a defect discovered in TCLList::operator= attempt to allow variables ! // as axis specs (failed). ! // ! // Revision 4.5.2.1 2004/07/01 13:55:29 ron-fox ! // Allow spectra that have 2^31 channels ! // ! // Revision 4.5 2004/02/04 14:52:04 ron-fox ! // Correct bug 99: Bad spectrum definitions crash spectcl ! // ! // Revision 4.4 2004/02/03 21:13:17 ron-fox ! // Correct comment describing spectrum channel ranges for spectra with resolutions. ! // ! // Revision 4.3.2.1 2004/02/02 21:47:08 ron-fox ! // *** empty log message *** ! // ! // Revision 4.3 2003/11/13 19:28:48 ron-fox ! // Ensure portable regardlesss of whether ! // malloc() is defined in stdlib.h or malloc.h ! // or memory.h ! // ! // Revision 4.2 2003/04/01 19:55:41 ron-fox ! // Support for Real valued parameters and spectra with arbitrary binnings. ! // ! //////////////////////////.cpp file///////////////////////////////////////////////////// // --- 1,18 ---- /* ! This software is Copyright by the Board of Trustees of Michigan ! State University (c) Copyright 2005. ! You may use this software under the terms of the GNU public license ! (GPL). The terms of this license are described at: ! http://www.gnu.org/licenses/gpl.txt ! Author: ! Ron Fox ! NSCL ! Michigan State University ! East Lansing, MI 48824-1321 */ ! // *************** *** 394,398 **** static const int MAXRESBITS(32); // Maximum resolution value. ! typedef std::vector<std::string>::iterator StrVectorIterator; struct SwitchInfo { --- 52,56 ---- static const int MAXRESBITS(32); // Maximum resolution value. ! typedef vector<string>::iterator StrVectorIterator; struct SwitchInfo { *************** *** 406,410 **** { "-delete", CSpectrumCommand::keDelete}, { "-all", CSpectrumCommand::keAll}, ! { "-byid", CSpectrumCommand::keById} }; --- 64,69 ---- { "-delete", CSpectrumCommand::keDelete}, { "-all", CSpectrumCommand::keAll}, ! { "-byid", CSpectrumCommand::keById}, ! { "-showgate", CSpectrumCommand::keShowGate}, }; *************** *** 418,422 **** public: CompareIds(CSpectrumCommand* p) : pCommand(p) {} ! int operator()(const std::string& i,const std::string& j) { return (pCommand->ExtractId(i) < pCommand->ExtractId(j)); } --- 77,81 ---- public: CompareIds(CSpectrumCommand* p) : pCommand(p) {} ! int operator()(const string& i,const string& j) { return (pCommand->ExtractId(i) < pCommand->ExtractId(j)); } *************** *** 428,434 **** public: CompareNames(CSpectrumCommand* p) : pCommand(p) {} ! int operator()(const std::string& i,const std::string& j) { ! std::string s1 = pCommand->ExtractName(i); ! std::string s2 = pCommand->ExtractName(j); return (strcmp(s1.c_str(), s2.c_str()) < 0); } --- 87,93 ---- public: CompareNames(CSpectrumCommand* p) : pCommand(p) {} ! int operator()(const string& i,const string& j) { ! string s1 = pCommand->ExtractName(i); ! string s2 = pCommand->ExtractName(j); return (strcmp(s1.c_str(), s2.c_str()) < 0); } *************** *** 594,598 **** int nListElements; char** ppListElements; ! std::vector<std::string> vParameters; CTCLList lParameters(&rInterpreter, pArgs[2]); --- 253,257 ---- int nListElements; char** ppListElements; ! vector<string> vParameters; CTCLList lParameters(&rInterpreter, pArgs[2]); *************** *** 607,613 **** // the vectors below: // ! std::vector<UInt_t> vChannels; // # channels on axis. ! std::vector<Float_t> vLows; // Low limit ! std::vector<Float_t> vHighs; // Hi limit. --- 266,272 ---- // the vectors below: // ! vector<UInt_t> vChannels; // # channels on axis. ! vector<Float_t> vLows; // Low limit ! vector<Float_t> vHighs; // Hi limit. *************** *** 752,822 **** CSpectrumPackage& rPack = (CSpectrumPackage& )getMyPackage(); - // If there are no parameters, then we just list them all. ! if(nArgs == 0) { // List with sort by name. ! std::vector<std::string> vDescriptions; ! rPack.ListSpectra(vDescriptions,"*"); ! SortSpectraByName(vDescriptions); ! VectorToResult(rResult, vDescriptions); ! return TCL_OK; ! } ! // If there are parameters, they must be switches or a parameter name: ! // The legal switchs are: ! // -id - List properties of following ident. ! // -byid - List all spectra sorted by id. ! // ! std::vector<std::string> vDescriptions; ! Int_t nId; ! const char* pattern; - switch(MatchSwitch(pArgs[0])) { - case keId: // List 1 spectrum given ident. - nArgs--; pArgs++; ! if((ParseInt(pArgs[0], &nId) != TCL_OK) || (nId < 0)) { rResult = "Invalid spectrum id "; rResult += pArgs[0]; rResult += "\n"; ! return TCL_ERROR; } ! return rPack.ListSpectrum(rResult, nId); ! case keById: // List all spectra sorted by ident. ! if(nArgs > 2) { // Too many command parameters... ! rResult = "Too many command line parameters\n"; Usage(rResult); return TCL_ERROR; } ! if(nArgs > 1) { ! pattern = pArgs[1]; ! } else { ! pattern = "*"; } ! rPack.ListSpectra(vDescriptions, pattern); ! SortSpectraById(vDescriptions); ! VectorToResult(rResult, vDescriptions); ! return TCL_OK; ! ! case keNotSwitch: // List ! if(nArgs > 1) ! { ! rResult = "Too many command line parameters or wrong parameters\n"; ! Usage(rResult); ! return TCL_ERROR; ! } ! else ! { ! pattern = pArgs[0]; ! rPack.ListSpectra(vDescriptions, pattern); ! VectorToResult(rResult, vDescriptions); ! return TCL_OK; ! } ! default: // Invalid switch in context. ! Usage(rResult); ! return TCL_ERROR; } ! rResult = "BUG - report this, CSpectrumCommand::Delete logic error"; ! return TCL_ERROR; } ////////////////////////////////////////////////////////////////////////// --- 411,503 ---- CSpectrumPackage& rPack = (CSpectrumPackage& )getMyPackage(); ! // First process the switches that are legal: ! ! bool idswitch = false; ! bool byidswitch = false; ! bool showgates = false; ! Switch result; ! ! while(nArgs && (result = MatchSwitch(pArgs[0])) != keNotSwitch) { ! switch(result) { ! case keId: ! idswitch = true; ! break; ! case keById: ! byidswitch = true; ! break; ! case keShowGate: ! showgates = true; ! break; ! default: ! rResult = "Switch "; ! rResult += pArgs[0]; ! rResult += " not recognized in this context\n"; ! Usage(rResult); ! return TCL_ERROR; ! } pArgs++; ! nArgs--; ! } ! // Any additional switches are parameters of the listing. ! // The bools: ! // idswitch, byidswitch, showgates reflect the presence ! // of these switches. ! ! // idswitch and byidswitch are not both allowed: ! ! ! if (idswitch && byidswitch) { ! rResult = "-id and -byid cannot both be specified on a -list operation\n"; ! Usage(rResult); ! return TCL_ERROR; ! } ! ! if (idswitch) { ! ! // List a single Id. ! ! Int_t nId; ! ! if (nArgs != 1) { ! rResult = "Need an id, and only an id to do a -list -id\n"; ! Usage(rResult); ! return TCL_ERROR; ! } ! if ((ParseInt(pArgs[0], &nId) != TCL_OK) || (nId < 0)) { rResult = "Invalid spectrum id "; rResult += pArgs[0]; rResult += "\n"; ! Usage(rResult); ! return TCL_ERROR; } ! return rPack.ListSpectrum(rResult, nId, showgates); ! } ! else { ! // List possibly matching a pattern. ! // Figure out the pattern or that there are too many parametesr. ! vector<string> vDescriptions; ! string pattern = "*"; ! ! ! if (nArgs > 1) { ! rResult = "Too many parameters. Expecting at most a spectrum name pattern only\n"; Usage(rResult); return TCL_ERROR; } ! if(nArgs) { ! pattern = string(pArgs[0]); } ! rPack.ListSpectra(vDescriptions, pattern.c_str(), showgates); ! if (byidswitch) { ! SortSpectraById(vDescriptions); ! } ! VectorToResult(rResult, vDescriptions); } ! return TCL_OK; ! } ////////////////////////////////////////////////////////////////////////// *************** *** 864,869 **** ! std::vector<UInt_t> vIds; ! std::vector<std::string> vNames; switch(MatchSwitch(pArgs[0])) { --- 545,550 ---- ! vector<UInt_t> vIds; ! vector<string> vNames; switch(MatchSwitch(pArgs[0])) { *************** *** 913,919 **** rResult += "Usage: \n"; rResult += " spectrum [-new] name type { parameters... } {axisdefs... [datatype]y\n"; ! rResult += " spectrum -list [-byid] [pattern]\n"; ! rResult += " spectrum -list name\n"; ! rResult += " spectrum -list -id id\n"; rResult += " spectrum -delete name1 [name2...]\n"; rResult += " spectrum -delete -id id1 [id2...]\n"; --- 594,600 ---- rResult += "Usage: \n"; rResult += " spectrum [-new] name type { parameters... } {axisdefs... [datatype]y\n"; ! rResult += " spectrum -list ?-byid? ?-showgate? [pattern]\n"; ! rResult += " spectrum -list pattern\n"; ! rResult += " spectrum -list -id ?-showgate? id\n"; rResult += " spectrum -delete name1 [name2...]\n"; rResult += " spectrum -delete -id id1 [id2...]\n"; *************** *** 952,961 **** // // Function: ! // void SortSpectraById(std::vector<std::string>& rvProperties) // Operation Type: // Utility. // void ! CSpectrumCommand::SortSpectraById(std::vector<std::string>& rvProperties) { // Sorts a vector of spectrum property strings by spectrum Id. The --- 633,642 ---- // // Function: ! // void SortSpectraById(vector<string>& rvProperties) // Operation Type: // Utility. // void ! CSpectrumCommand::SortSpectraById(vector<string>& rvProperties) { // Sorts a vector of spectrum property strings by spectrum Id. The *************** *** 968,977 **** // // Function: ! // void SortSpectraByName(std::vector<std::string>& rvProperties) // Operation type: // protected utility. // void ! CSpectrumCommand::SortSpectraByName(std::vector<std::string>& rvProperties) { // Sorts a vector of spectrum property strings by spectrum name. --- 649,658 ---- // // Function: ! // void SortSpectraByName(vector<string>& rvProperties) // Operation type: // protected utility. // void ! CSpectrumCommand::SortSpectraByName(vector<string>& rvProperties) { // Sorts a vector of spectrum property strings by spectrum name. *************** *** 986,990 **** // Function: // void VectorToResult(CTCLResult& rResult, ! // std::vector<std::string>& rvStrings) // Operation Type: // protected Utility function. --- 667,671 ---- // Function: // void VectorToResult(CTCLResult& rResult, ! // vector<string>& rvStrings) // Operation Type: // protected Utility function. *************** *** 992,996 **** void CSpectrumCommand::VectorToResult(CTCLResult& rResult, ! std::vector<std::string>& rvStrings) { // Appends a vector of strings as a list to rResult. --- 673,677 ---- void CSpectrumCommand::VectorToResult(CTCLResult& rResult, ! vector<string>& rvStrings) { // Appends a vector of strings as a list to rResult. *************** *** 1007,1016 **** // // Function: ! // UInt_t ExtractId(const std::string& rProperties) // Operation Type: // Public Utility. // UInt_t ! CSpectrumCommand::ExtractId(const std::string& rProperties) { // Takes a spectrum properties string of the form: --- 688,697 ---- // // Function: ! // UInt_t ExtractId(const string& rProperties) // Operation Type: // Public Utility. // UInt_t ! CSpectrumCommand::ExtractId(const string& rProperties) { // Takes a spectrum properties string of the form: *************** *** 1032,1041 **** // // Function: ! // std::string ExtractName(const std::string& rProperties) // Operation type: // Public utility // ! std::string ! CSpectrumCommand::ExtractName(const std::string& rProperties) { // Returns the spectrum name from a spectrum property list of the form: --- 713,722 ---- // // Function: ! // string ExtractName(const string& rProperties) // Operation type: // Public utility // ! string ! CSpectrumCommand::ExtractName(const string& rProperties) { // Returns the spectrum name from a spectrum property list of the form: *************** *** 1050,1054 **** PropertyList.Split(nElements, &pElements); ! std::string Result(pElements[1]); Tcl_Free((char*)pElements); return Result; --- 731,735 ---- PropertyList.Split(nElements, &pElements); ! string Result(pElements[1]); Tcl_Free((char*)pElements); return Result; Index: SpectrumCommand.h =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/SpecTcl/SpectrumCommand.h,v retrieving revision 5.2 retrieving revision 5.3 diff -C2 -d -r5.2 -r5.3 *** SpectrumCommand.h 3 Jun 2005 15:19:28 -0000 5.2 --- SpectrumCommand.h 21 Feb 2006 19:30:59 -0000 5.3 *************** *** 1,279 **** /* ! GNU GENERAL PUBLIC LICENSE ! Version 2, June 1991 ! ! Copyright (C) 1989, 1991 Free Software Foundation, Inc. ! 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ! Everyone is permitted to copy and distribute verbatim copies ! of this license document, but changing it is not allowed. ! ! Preamble ! ! The licenses for most software are designed to take away your ! freedom to share and change it. By contrast, the GNU General Public ! License is intended to guarantee your freedom to share and change free ! software--to make sure the software is free for all its users. This ! General Public License applies to most of the Free Software ! Foundation's software and to any other program whose authors commit to ! using it. (Some other Free Software Foundation software is covered by ! the GNU Library General Public License instead.) You can apply it to ! your programs, too. ! ! When we speak of free software, we are referring to freedom, not ! price. Our General Public Licenses are designed to make sure that you ! have the freedom to distribute copies of free software (and charge for ! this service if you wish), that you receive source code or can get it ! if you want it, that you can change the software or use pieces of it ! in new free programs; and that you know you can do these things. ! ! To protect your rights, we need to make restrictions that forbid ! anyone to deny you these rights or to ask you to surrender the rights. ! These restrictions translate to certain responsibilities for you if you ! distribute copies of the software, or if you modify it. ! ! For example, if you distribute copies of such a program, whether ! gratis or for a fee, you must give the recipients all the rights that ! you have. You must make sure that they, too, receive or can get the ! source code. And you must show them these terms so they know their ! rights. ! ! We protect your rights with two steps: (1) copyright the software, and ! (2) offer you this license which gives you legal permission to copy, ! distribute and/or modify the software. ! ! Also, for each author's protection and ours, we want to make certain ! that everyone understands that there is no warranty for this free ! software. If the software is modified by someone else and passed on, we ! want its recipients to know that what they have is not the original, so ! that any problems introduced by others will not reflect on the original ! authors' reputations. ! ! Finally, any free program is threatened constantly by software ! patents. We wish to avoid the danger that redistributors of a free ! program will individually obtain patent licenses, in effect making the ! program proprietary. To prevent this, we have made it clear that any ! patent must be licensed for everyone's free use or not licensed at all. ! ! The precise terms and conditions for copying, distribution and ! modification follow. ! ! GNU GENERAL PUBLIC LICENSE ! TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION ! ! 0. This License applies to any program or other work which contains ! a notice placed by the copyright holder saying it may be distributed ! under the terms of this General Public License. The "Program", below, ! refers to any such program or work, and a "work based on the Program" ! means either the Program or any derivative work under copyright law: ! that is to say, a work containing the Program or a portion of it, ! either verbatim or with modifications and/or translated into another ! language. (Hereinafter, translation is included without limitation in ! the term "modification".) Each licensee is addressed as "you". ! ! Activities other than copying, distribution and modification are not ! covered by this License; they are outside its scope. The act of ! running the Program is not restricted, and the output from the Program ! is covered only if its contents constitute a work based on the ! Program (independent of having been made by running the Program). ! Whether that is true depends on what the Program does. ! ! 1. You may copy and distribute verbatim copies of the Program's ! source code as you receive it, in any medium, provided that you ! conspicuously and appropriately publish on each copy an appropriate ! copyright notice and disclaimer of warranty; keep intact all the ! notices that refer to this License and to the absence of any warranty; ! and give any other recipients of the Program a copy of this License ! along with the Program. ! ! You may charge a fee for the physical act of transferring a copy, and ! you may at your option offer warranty protection in exchange for a fee. ! ! 2. You may modify your copy or copies of the Program or any portion ! of it, thus forming a work based on the Program, and copy and ! distribute such modifications or work under the terms of Section 1 ! above, provided that you also meet all of these conditions: ! ! a) You must cause the modified files to carry prominent notices ! stating that you changed the files and the date of any change. ! ! b) You must cause any work that you distribute or publish, that in ! whole or in part contains or is derived from the Program or any ! part thereof, to be licensed as a whole at no charge to all third ! parties under the terms of this License. ! ! c) If the modified program normally reads commands interactively ! when run, you must cause it, when started running for such ! interactive use in the most ordinary way, to print or display an ! announcement including an appropriate copyright notice and a ! notice that there is no warranty (or else, saying that you provide ! a warranty) and that users may redistribute the program under ! these conditions, and telling the user how to view a copy of this ! License. (Exception: if the Program itself is interactive but ! does not normally print such an announcement, your work based on ! the Program is not required to print an announcement.) ! ! These requirements apply to the modified work as a whole. If ! identifiable sections of that work are not derived from the Program, ! and can be reasonably considered independent and separate works in ! themselves, then this License, and its terms, do not apply to those ! sections when you distribute them as separate works. But when you ! distribute the same sections as part of a whole which is a work based ! on the Program, the distribution of the whole must be on the terms of ! this License, whose permissions for other licensees extend to the ! entire whole, and thus to each and every part regardless of who wrote it. ! ! Thus, it is not the intent of this section to claim rights or contest ! your rights to work written entirely by you; rather, the intent is to ! exercise the right to control the distribution of derivative or ! collective works based on the Program. ! ! In addition, mere aggregation of another work not based on the Program ! with the Program (or with a work based on the Program) on a volume of ! a storage or distribution medium does not bring the other work under ! the scope of this License. ! ! 3. You may copy and distribute the Program (or a work based on it, ! under Section 2) in object code or executable form under the terms of ! Sections 1 and 2 above provided that you also do one of the following: ! ! a) Accompany it with the complete corresponding machine-readable ! source code, which must be distributed under the terms of Sections ! 1 and 2 above on a medium customarily used for software interchange; or, ! ! b) Accompany it with a written offer, valid for at least three ! years, to give any third party, for a charge no more than your ! cost of physically performing source distribution, a complete ! machine-readable copy of the corresponding source code, to be ! distributed under the terms of Sections 1 and 2 above on a medium ! customarily used for software interchange; or, ! ! c) Accompany it with the information you received as to the offer ! to distribute corresponding source code. (This alternative is ! allowed only for noncommercial distribution and only if you ! received the program in object code or executable form with such ! an offer, in accord with Subsection b above.) ! ! The source code for a work means the preferred form of the work for ! making modifications to it. For an executable work, complete source ! code means all the source code for all modules it contains, plus any ! associated interface definition files, plus the scripts used to ! control compilation and installation of the executable. However, as a ! special exception, the source code distributed need not include ! anything that is normally distributed (in either source or binary ! form) with the major components (compiler, kernel, and so on) of the ! operating system on which the executable runs, unless that component ! itself accompanies the executable. ! ! If distribution of executable or object code is made by offering ! access to copy from a designated place, then offering equivalent ! access to copy the source code from the same place counts as ! distribution of the source code, even though third parties are not ! compelled to copy the source along with the object code. ! ! 4. You may not copy, modify, sublicense, or distribute the Program ! except as expressly provided under this License. Any attempt ! otherwise to copy, modify, sublicense or distribute the Program is ! void, and will automatically terminate your rights under this License. ! However, parties who have received copies, or rights, from you under ! this License will not have their licenses terminated so long as such ! parties remain in full compliance. ! ! 5. You are not required to accept this License, since you have not ! signed it. However, nothing else grants you permission to modify or ! distribute the Program or its derivative works. These actions are ! prohibited by law if you do not accept this License. Therefore, by ! modifying or distributing the Program (or any work based on the ! Program), you indicate your acceptance of this License to do so, and ! all its terms and conditions for copying, distributing or modifying ! the Program or works based on it. ! ! 6. Each time you redistribute the Program (or any work based on the ! Program), the recipient automatically receives a license from the ! original licensor to copy, distribute or modify the Program subject to ! these terms and conditions. You may not impose any further ! restrictions on the recipients' exercise of the rights granted herein. ! You are not responsible for enforcing compliance by third parties to ! this License. ! ! 7. If, as a consequence of a court judgment or allegation of patent ! infringement or for any other reason (not limited to patent issues), ! conditions are imposed on you (whether by court order, agreement or ! otherwise) that contradict the conditions of this License, they do not ! excuse you from the conditions of this License. If you cannot ! distribute so as to satisfy simultaneously your obligations under this ! License and any other pertinent obligations, then as a consequence you ! may not distribute the Program at all. For example, if a patent ! license would not permit royalty-free redistribution of the Program by ! all those who receive copies directly or indirectly through you, then ! the only way you could satisfy both it and this License would be to ! refrain entirely from distribution of the Program. ! ! If any portion of this section is held invalid or unenforceable under ! any particular circumstance, the balance of the section is intended to ! apply and the section as a whole is intended to apply in other ! circumstances. ! ! It is not the purpose of this section to induce you to infringe any ! patents or other property right claims or to contest validity of any ! such claims; this section has the sole purpose of protecting the ! integrity of the free software distribution system, which is ! implemented by public license practices. Many people have made ! generous contributions to the wide range of software distributed ! through that system in reliance on consistent application of that ! system; it is up to the author/donor to decide if he or she is willing ! to distribute software through any other system and a licensee cannot ! impose that choice. ! ! This section is intended to make thoroughly clear what is believed to ! be a consequence of the rest of this License. ! ! 8. If the distribution and/or use of the Program is restricted in ! certain countries either by patents or by copyrighted interfaces, the ! original copyright holder who places the Program under this License ! may add an explicit geographical distribution limitation excluding ! those countries, so that distribution is permitted only in or among ! countries not thus excluded. In such case, this License incorporates ! the limitation as if written in the body of this License. ! ! 9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. ! ! Each version is given a distinguishing version number. If the Program ! specifies a version number of this License which applies to it and "any ! later version", you have the option of following the terms and conditions ! either of that version or of any later version published by the Free Software ! Foundation. If the Program does not specify a version number of this License, ! you may choose any version ever published by the Free Software Foundation. ! ! 10. If you wish to incorporate parts of the Program into other free ! programs whose distribution conditions are different, write to the author to ! ask for permission. For software which is copyrighted by the Free Software ! Foundation, write to the Free Software Foundation; we sometimes make ! exceptions for this. Our decision will be guided by the two goals of ! preserving the free status of all derivatives of our free software and of ! promoting the sharing and reuse of software generally. ! ! NO WARRANTY ! 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR ! THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN ! OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE ! THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, ! INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND ! FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND ! PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, ! YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. ! 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING ! WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR ! REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, ! INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING ! OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO ! LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR ! THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), ! EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH ! DAMAGES. ! END OF TERMS AND CONDITIONS ' */ // CSpectrumCommand.h: // --- 1,18 ---- /* ! This software is Copyright by the Board of Trustees of Michigan ! State University (c) Copyright 2005. ! You may use this software under the terms of the GNU public license ! (GPL). The terms of this license are described at: ! http://www.gnu.org/licenses/gpl.txt ! Author: ! Ron Fox ! NSCL ! Michigan State University ! East Lansing, MI 48824-1321 */ + // CSpectrumCommand.h: // *************** *** 330,333 **** --- 69,73 ---- keAll, keById, + keShowGate, keNotSwitch }; |