[Echempp-devel] Experiment/ExcitationFunction segment.hpp, 1.38, 1.39

[beeblbrox <bee...@us...>]

Update of /cvsroot/echempp/Experiment/ExcitationFunction
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv25043/Experiment/ExcitationFunction

Modified Files:
	segment.hpp 
Log Message:
Reintroduced id() needed internally by excitation func. dialogs.


Index: segment.hpp
===================================================================
RCS file: /cvsroot/echempp/Experiment/ExcitationFunction/segment.hpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** segment.hpp	19 Dec 2007 14:18:52 -0000	1.38
--- segment.hpp	22 Dec 2007 15:49:53 -0000	1.39
***************
*** 135,138 ****
--- 135,139 ----
      {
      public:
+       virtual ~Segment(){}
        //! the version of all Segment classes
        /*! The version is returned by a static function as a std::string;
***************
*** 143,146 ****
--- 144,149 ----
  	  + ::quantity::Quantities::Version ();
        }
+      //! id needed by ExcitationFunction dialogs internally
+       virtual const std::string id() const { return "Segment"; }
        BSUtilities::Serialization::AutoRegistor<Segment> reg;
        static const std::string GUID;
***************
*** 225,228 ****
--- 228,233 ----
  	return 0;
        }
+       //! id needed by ExcitationFunction dialogs internally
+       virtual const std::string id() const { return "DISegment"; }
  
        static const std::string create_guid()
***************
*** 409,412 ****
--- 414,419 ----
  	return "LinearSegment_" + D::create_guid() + "_" + I::create_guid(); 
        }
+       //! id needed by ExcitationFunction dialogs internally
+       const std::string id() const { return "Linear"; }
        BSUtilities::Serialization::AutoRegistor<LinearSegment<D,I> > reg;
        static const std::string GUID;
***************
*** 564,567 ****
--- 571,576 ----
  	return "ConstantSegment_" + D::create_guid() + "_" + I::create_guid(); 
        }
+       //! id needed by ExcitationFunction dialogs internally
+       const std::string id() const { return "Constant"; }
        BSUtilities::Serialization::AutoRegistor<ConstantSegment<D,I> > reg;
        static const std::string GUID;
***************
*** 734,737 ****
--- 743,748 ----
  	catch (std::bad_cast) {return false;}
        }
+       //! id needed by ExcitationFunction dialogs internally
+       const std::string id() const { return "Sine"; }
        static const std::string create_guid()
        {
***************
*** 926,929 ****
--- 937,941 ----
  	catch (std::bad_cast) {return false;}
        }
+       const std::string id() const { return "Power"; }
        static const std::string create_guid()
        {
***************
*** 1109,1112 ****
--- 1121,1125 ----
  	catch (std::bad_cast) {return false;}
        }
+       const std::string id() const { return "Exp"; }
        static const std::string create_guid()
        {
***************
*** 1311,1314 ****
--- 1324,1328 ----
        catch (std::bad_cast) {return false;}
        }
+       const std::string id() const { return "PowerExp"; }
        static const std::string create_guid()
        {
***************
*** 1498,1501 ****
--- 1512,1516 ----
        */
        DigitalSegment (void) {}
+       const std::string id() const { return "Digital"; }
        static const std::string create_guid()
        {