excitation: allow to enable/disable an excitation

Signed-off-by: Thorsten Liebig <Thorsten.Liebig@gmx.de>

Author: thliebig

python/CSXCAD/CSProperties.pxd

@@ -183,6 +183,9 @@ cdef extern from "CSXCAD/CSPropExcitation.h":
             void SetExcitation(double val, int Component)
             double GetExcitation(int Component)
 
+            void SetEnabled(bool val)
+            bool GetEnabled()
+
             void SetPropagationDir(double val, int Component)
             double GetPropagationDir(int Component)
 

python/CSXCAD/CSProperties.pyx

@@ -909,6 +909,15 @@ cdef class CSPropExcitation(CSProperties):
         """
         return (<_CSPropExcitation*>self.thisptr).GetExcitType()
 
+
+    def SetEnabled(self, val):
+        """ Enable/Disable the excitation"""
+        (<_CSPropExcitation*>self.thisptr).SetEnabled(val)
+
+    def GetEnabled(self):
+        """ Get enable/disable state of the excitation"""
+        return (<_CSPropExcitation*>self.thisptr).GetEnabled()
+
     def SetExcitation(self, val):
         """ SetExcitation(val)
 

src/CSPropExcitation.cpp

@@ -26,6 +26,7 @@ CSPropExcitation::CSPropExcitation(CSPropExcitation* prop, bool copyPrim) : CSPr
 	Init();
 	uiNumber=prop->uiNumber;
 	iExcitType=prop->iExcitType;
+	m_enabled=prop->m_enabled;
 	coordInputType=prop->coordInputType;
 	m_Frequency.Copy(&prop->m_Frequency);
 	Delay.Copy(&prop->Delay);
@@ -140,6 +141,7 @@ void CSPropExcitation::Init()
 {
 	uiNumber=0;
 	iExcitType=1;
+	m_enabled=true;
 	coordInputType=UNDEFINED_CS;
 	m_Frequency.SetValue(0.0);
 	Delay.SetValue(0.0);
@@ -232,6 +234,7 @@ bool CSPropExcitation::Write2XML(TiXmlNode& root, bool parameterised, bool spars
 	if (prop==NULL) return false;
 
 	prop->SetAttribute("Number",(int)uiNumber);
+	prop->SetAttribute("Enabled",m_enabled);
 	WriteTerm(m_Frequency,*prop,"Frequency",parameterised);
 	WriteTerm(Delay,*prop,"Delay",parameterised);
 
@@ -260,6 +263,8 @@ bool CSPropExcitation::ReadFromXML(TiXmlNode &root)
 	if (prop->QueryIntAttribute("Number",&iHelp)!=TIXML_SUCCESS) uiNumber=0;
 	else uiNumber=(unsigned int)iHelp;
 
+	prop->QueryBoolAttribute("Enabled",&m_enabled);
+
 	if (prop->QueryIntAttribute("Type",&iExcitType)!=TIXML_SUCCESS) return false;
 
 	if (ReadVectorTerm(Excitation,*prop,"Excite",0.0)==false) return false;
@@ -285,6 +290,7 @@ void CSPropExcitation::ShowPropertyStatus(std::ostream& stream)
 	CSProperties::ShowPropertyStatus(stream);
 	stream << " --- Excitation Properties --- " << std::endl;
 	stream << "  Type: " << iExcitType << std::endl;
+	stream << "  Enabled: " << m_enabled << std::endl;
 	stream << "  Active directions: " << ActiveDir[0] << "," << ActiveDir[1] << "," << ActiveDir[2] << std::endl;
 	stream << "  Excitation\t: " << Excitation[0].GetValueString() << ", "  << Excitation[1].GetValueString() << ", "  << Excitation[2].GetValueString()  << std::endl;
 	stream << "  Weighting\t: " << WeightFct[0].GetValueString() << ", "  << WeightFct[1].GetValueString() << ", "  << WeightFct[2].GetValueString()  << std::endl;

src/CSPropExcitation.h

@@ -61,6 +61,11 @@ class CSXCAD_EXPORT CSPropExcitation : public CSProperties
 	//! Get the excitation frequency as a string
 	const std::string GetFrequencyString()  {return m_Frequency.GetValueString();}
 
+	//! Set this excitation to be enabled or not
+	void SetEnabled(bool val) {m_enabled=val;}
+	//! Get if this excitation is enabled or not
+	bool GetEnabled() {return m_enabled;}
+
 	//! Set the excitation amplitude for a given component
 	void SetExcitation(double val, int Component=0);
 	//! Set the excitation amplitude for a given component
@@ -108,6 +113,7 @@ class CSXCAD_EXPORT CSPropExcitation : public CSProperties
 protected:
 	unsigned int uiNumber;
 	int iExcitType;
+	bool m_enabled;
 	bool ActiveDir[3];
 	ParameterScalar m_Frequency;
 	ParameterScalar Excitation[3];		// excitation amplitude vector