API change: renamed property: Electrode --> Excitation

thliebig · Jul 16, 2012 · a68a77d · a68a77d
1 parent 15f8750
commit a68a77d
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 27 deletions.
diff --git a/QCSPrimEditor.cpp b/QCSPrimEditor.cpp
@@ -167,8 +167,8 @@ void QCSPrimEditor::UpdatePropertyCB()
 			case CSProperties::METAL:
 				str+=tr(" (Metal)");
 				break;
-			case CSProperties::ELECTRODE:
-				str+=tr(" (Electrode)");
+			case CSProperties::EXCITATION:
+				str+=tr(" (Excitation)");
 				break;
 			case CSProperties::PROBEBOX:
 				str+=tr(" (Charge-Box)");

diff --git a/QCSPropEditor.cpp b/QCSPropEditor.cpp
@@ -117,8 +117,8 @@ QCSPropertyGroupBox* QCSPropEditor::BuildPropGroupBox(CSProperties* clProp)
 			break;
 		case CSProperties::METAL:
 			break;
-		case CSProperties::ELECTRODE:
-			propGB = new QCSPropElectrodeGB(clProp->ToElectrode());
+		case CSProperties::EXCITATION:
+			propGB = new QCSPropExcitationGB(clProp->ToExcitation());
 			break;
 		case CSProperties::PROBEBOX:
 			propGB = new QCSPropProbeBoxGB(clProp->ToProbeBox());
@@ -181,8 +181,8 @@ void QCSPropEditor::ChangeType(int item)
 		case CSProperties::METAL:
 			clProp = new CSPropMetal(saveProp);
 			break;
-		case CSProperties::ELECTRODE:
-			clProp = new CSPropElectrode(saveProp);
+		case CSProperties::EXCITATION:
+			clProp = new CSPropExcitation(saveProp);
 			break;
 		case CSProperties::PROBEBOX:
 			clProp = new CSPropProbeBox(saveProp);
@@ -228,7 +228,7 @@ QGroupBox* QCSPropEditor::BuildGeneral()
 	TypeCB->addItem(tr("Unknown"),QVariant(CSProperties::UNKNOWN));
 	TypeCB->addItem(tr("Material"),QVariant(CSProperties::MATERIAL));
 	TypeCB->addItem(tr("Metal"),QVariant(CSProperties::METAL));
-	TypeCB->addItem(tr("Electrode"),QVariant(CSProperties::ELECTRODE));
+	TypeCB->addItem(tr("Excitation"),QVariant(CSProperties::EXCITATION));
 	TypeCB->addItem(tr("Probe Box"),QVariant(CSProperties::PROBEBOX));
 	TypeCB->addItem(tr("Res Box"),QVariant(CSProperties::RESBOX));
 	TypeCB->addItem(tr("Dump Box"),QVariant(CSProperties::DUMPBOX));
@@ -397,12 +397,12 @@ void QCSPropMaterialGB::GetValues()
 {
 }
 
-/***************************QCSPropElectrodeGB**************************************/
-QCSPropElectrodeGB::QCSPropElectrodeGB(CSPropElectrode *prop, QWidget *parent) : QCSPropertyGroupBox(parent)
+/***************************QCSPropExcitationGB**************************************/
+QCSPropExcitationGB::QCSPropExcitationGB(CSPropExcitation *prop, QWidget *parent) : QCSPropertyGroupBox(parent)
 {
 	clProp=prop;
-	TypeName=QString(tr("Electrode"));
-	setTitle(tr("Electrode Property"));
+	TypeName=QString(tr("Excitation"));
+	setTitle(tr("Excitation Property"));
 
 	QGridLayout* layout = new QGridLayout();
 
@@ -451,11 +451,11 @@ QCSPropElectrodeGB::QCSPropElectrodeGB(CSPropElectrode *prop, QWidget *parent) :
 	setLayout(layout);
 }
 
-QCSPropElectrodeGB::~QCSPropElectrodeGB()
+QCSPropExcitationGB::~QCSPropExcitationGB()
 {
 }
 
-void QCSPropElectrodeGB::SetValues()
+void QCSPropExcitationGB::SetValues()
 {
 	bool bOk;
 	double dVal;
@@ -474,7 +474,7 @@ void QCSPropElectrodeGB::SetValues()
 		clProp->SetWeightFunction(FctLine[i]->text().toLatin1().data(),i);
 }
 
-void QCSPropElectrodeGB::GetValues()
+void QCSPropExcitationGB::GetValues()
 {
 	string line;
 
@@ -493,7 +493,7 @@ void QCSPropElectrodeGB::GetValues()
 		FctLine[i]->setText(clProp->GetWeightFunction(i).c_str());
 }
 
-void QCSPropElectrodeGB::TypeChanged(int index)
+void QCSPropExcitationGB::TypeChanged(int index)
 {
 	//enable/disable certain lines, depending on the excitation typez
 	switch (index)

diff --git a/QCSPropEditor.h b/QCSPropEditor.h
@@ -149,12 +149,12 @@ public slots:
 	CSPropMaterial* clProp;
 };
 
-class QCSPropElectrodeGB : public QCSPropertyGroupBox
+class QCSPropExcitationGB : public QCSPropertyGroupBox
 {
 	Q_OBJECT
 public:
-	QCSPropElectrodeGB(CSPropElectrode *prop, QWidget *parent=NULL);
-	virtual ~QCSPropElectrodeGB();
+	QCSPropExcitationGB(CSPropExcitation *prop, QWidget *parent=NULL);
+	virtual ~QCSPropExcitationGB();
 
 public slots:
 	virtual void SetValues();
@@ -167,7 +167,7 @@ protected slots:
 	void modified();
 
 protected:
-	CSPropElectrode* clProp;
+	CSPropExcitation* clProp;
 
 	QLineEdit* FctLine[3];
 

diff --git a/QCSTreeWidget.cpp b/QCSTreeWidget.cpp
@@ -133,7 +133,7 @@ void QCSTreeWidget::contextMenuEvent(QContextMenuEvent *event)
 		QMenu* propM = menu.addMenu(QIcon(":/images/edit_add.png"),tr("New Property"));
 		propM->addAction(tr("Material"),this,SIGNAL(NewMaterial()));
 		propM->addAction(tr("Metal"),this,SIGNAL(NewMetal()));
-		propM->addAction(tr("Electrode"),this,SIGNAL(NewElectrode()));
+		propM->addAction(tr("Excitation"),this,SIGNAL(NewExcitation()));
 		propM->addAction(tr("Probe-Box"),this,SIGNAL(NewChargeBox()));
 		propM->addAction(tr("Res-Box"),this,SIGNAL(NewResBox()));
 		propM->addAction(tr("Dump-Box"),this,SIGNAL(NewDumpBox()));

diff --git a/QCSTreeWidget.h b/QCSTreeWidget.h
@@ -58,7 +58,7 @@ class QCSTreeWidget : public QTreeWidget
 
 	void NewMaterial();
 	void NewMetal();
-	void NewElectrode();
+	void NewExcitation();
 	void NewChargeBox();
 	void NewResBox();
 	void NewDumpBox();

diff --git a/QCSXCAD.cpp b/QCSXCAD.cpp
@@ -95,7 +95,7 @@ QCSXCAD::QCSXCAD(QWidget *parent) : QMainWindow(parent)
 
 	QObject::connect(CSTree,SIGNAL(NewMaterial()),this,SLOT(NewMaterial()));
 	QObject::connect(CSTree,SIGNAL(NewMetal()),this,SLOT(NewMetal()));
-	QObject::connect(CSTree,SIGNAL(NewElectrode()),this,SLOT(NewElectrode()));
+	QObject::connect(CSTree,SIGNAL(NewExcitation()),this,SLOT(NewExcitation()));
 	QObject::connect(CSTree,SIGNAL(NewChargeBox()),this,SLOT(NewChargeBox()));
 	QObject::connect(CSTree,SIGNAL(NewResBox()),this,SLOT(NewResBox()));
 	QObject::connect(CSTree,SIGNAL(NewDumpBox()),this,SLOT(NewDumpBox()));
@@ -640,9 +640,9 @@ void QCSXCAD::NewMetal()
 	NewProperty(new CSPropMetal(clParaSet));
 }
 
-void QCSXCAD::NewElectrode()
+void QCSXCAD::NewExcitation()
 {
-	NewProperty(new CSPropElectrode(clParaSet,GetQtyPropertyType(CSProperties::ELECTRODE)));
+	NewProperty(new CSPropExcitation(clParaSet,GetQtyPropertyType(CSProperties::EXCITATION)));
 }
 
 void QCSXCAD::NewChargeBox()
@@ -947,8 +947,8 @@ void QCSXCAD::BuildToolBar()
 		newAct = newObjct->addAction(tr("Metal"),this,SLOT(NewMetal()));
 		newAct->setToolTip(tr("add new Metal-Property"));
 
-		newAct = newObjct->addAction(tr("Electrode"),this,SLOT(NewElectrode()));
-		newAct->setToolTip(tr("add new Electrode-Property"));
+		newAct = newObjct->addAction(tr("Excitation"),this,SLOT(NewExcitation()));
+		newAct->setToolTip(tr("add new Excitation-Property"));
 
 		newAct = newObjct->addAction(tr("ProbeBox"),this,SLOT(NewChargeBox()));
 		newAct->setToolTip(tr("add new Probe-Box-Property"));

diff --git a/QCSXCAD.h b/QCSXCAD.h
@@ -122,7 +122,7 @@ protected slots:
 
 	void NewMaterial();
 	void NewMetal();
-	void NewElectrode();
+	void NewExcitation();
 	void NewChargeBox();
 	void NewResBox();
 	void NewDumpBox();