summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.codelite/.tern-port2
-rw-r--r--.codelite/PSP.session8
-rw-r--r--.codelite/PSP.tagsbin83549184 -> 83549184 bytes
-rw-r--r--.codelite/compilation.dbbin63488 -> 63488 bytes
-rw-r--r--.codelite/refactoring.dbbin2154496 -> 2187264 bytes
-rw-r--r--Project/Project.mk2
-rw-r--r--Project/Release/PSP-UFU.exebin4191127 -> 4204969 bytes
-rw-r--r--Project/Release/TextForm.cpp.obin116147 -> 133507 bytes
-rw-r--r--Project/TextForm.cpp255
9 files changed, 224 insertions, 43 deletions
diff --git a/.codelite/.tern-port b/.codelite/.tern-port
index 67fcb07..21f4ae1 100644
--- a/.codelite/.tern-port
+++ b/.codelite/.tern-port
@@ -1 +1 @@
-64886 \ No newline at end of file
+63475 \ No newline at end of file
diff --git a/.codelite/PSP.session b/.codelite/PSP.session
index 6172c4b..39a9576 100644
--- a/.codelite/PSP.session
+++ b/.codelite/PSP.session
@@ -47,8 +47,8 @@
</TabInfo>
<TabInfo>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Text.h" Name="FileName"/>
- <int Value="48" Name="FirstVisibleLine"/>
- <int Value="33" Name="CurrentLine"/>
+ <int Value="12" Name="FirstVisibleLine"/>
+ <int Value="21" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
@@ -75,8 +75,8 @@
</TabInfo>
<TabInfo>
<wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\TextForm.cpp" Name="FileName"/>
- <int Value="160" Name="FirstVisibleLine"/>
- <int Value="170" Name="CurrentLine"/>
+ <int Value="350" Name="FirstVisibleLine"/>
+ <int Value="373" Name="CurrentLine"/>
<wxArrayString Name="Bookmarks"/>
<IntVector Name="CollapsedFolds"/>
</TabInfo>
diff --git a/.codelite/PSP.tags b/.codelite/PSP.tags
index 68167b4..829eee3 100644
--- a/.codelite/PSP.tags
+++ b/.codelite/PSP.tags
Binary files differ
diff --git a/.codelite/compilation.db b/.codelite/compilation.db
index 794342b..0860fa5 100644
--- a/.codelite/compilation.db
+++ b/.codelite/compilation.db
Binary files differ
diff --git a/.codelite/refactoring.db b/.codelite/refactoring.db
index 989f346..620b2ad 100644
--- a/.codelite/refactoring.db
+++ b/.codelite/refactoring.db
Binary files differ
diff --git a/Project/Project.mk b/Project/Project.mk
index 2feed7d..38c81ac 100644
--- a/Project/Project.mk
+++ b/Project/Project.mk
@@ -13,7 +13,7 @@ CurrentFileName :=
CurrentFilePath :=
CurrentFileFullPath :=
User :=Thales
-Date :=29/11/2016
+Date :=30/11/2016
CodeLitePath :="C:/Program Files/CodeLite"
LinkerName :=C:/TDM-GCC-64/bin/g++.exe
SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC
diff --git a/Project/Release/PSP-UFU.exe b/Project/Release/PSP-UFU.exe
index d665b65..545a547 100644
--- a/Project/Release/PSP-UFU.exe
+++ b/Project/Release/PSP-UFU.exe
Binary files differ
diff --git a/Project/Release/TextForm.cpp.o b/Project/Release/TextForm.cpp.o
index eaa0a65..39968df 100644
--- a/Project/Release/TextForm.cpp.o
+++ b/Project/Release/TextForm.cpp.o
Binary files differ
diff --git a/Project/TextForm.cpp b/Project/TextForm.cpp
index a36e4b2..8c9c724 100644
--- a/Project/TextForm.cpp
+++ b/Project/TextForm.cpp
@@ -61,7 +61,102 @@ void TextForm::OnNameChoiceSelected(wxCommandEvent& event)
void TextForm::OnTextEnter(wxCommandEvent& event) {}
void TextForm::OnToBusChoiceSelected(wxCommandEvent& event) {}
-void TextForm::OnTypeChoiceSelected(wxCommandEvent& event) {}
+void TextForm::OnTypeChoiceSelected(wxCommandEvent& event)
+{
+ switch(m_text->GetElementType()) {
+ case TYPE_BUS: {
+ switch(m_choiceTextType->GetSelection()) {
+ case 0: {
+ m_text->SetDataType(DATA_NAME);
+ } break;
+ case 1: {
+ m_text->SetDataType(DATA_VOLTAGE);
+ } break;
+ case 2: {
+ m_text->SetDataType(DATA_ANGLE);
+ } break;
+ case 3: {
+ m_text->SetDataType(DATA_SC_CURRENT);
+ } break;
+ case 4: {
+ m_text->SetDataType(DATA_SC_VOLTAGE);
+ } break;
+ case 5: {
+ m_text->SetDataType(DATA_SC_POWER);
+ } break;
+ }
+ } break;
+ case TYPE_SYNC_GENERATOR: {
+ switch(m_choiceTextType->GetSelection()) {
+ case 0: {
+ m_text->SetDataType(DATA_NAME);
+ } break;
+ case 1: {
+ m_text->SetDataType(DATA_ACTIVE_POWER);
+ } break;
+ case 2: {
+ m_text->SetDataType(DATA_REACTIVE_POWER);
+ } break;
+ case 3: {
+ m_text->SetDataType(DATA_SC_CURRENT);
+ } break;
+ }
+ } break;
+ case TYPE_LINE:
+ case TYPE_TRANSFORMER: {
+ switch(m_choiceTextType->GetSelection()) {
+ case 0: {
+ m_text->SetDataType(DATA_NAME);
+ } break;
+ case 1: {
+ m_text->SetDataType(DATA_PF_ACTIVE);
+ } break;
+ case 2: {
+ m_text->SetDataType(DATA_PF_REACTIVE);
+ } break;
+ case 3: {
+ m_text->SetDataType(DATA_PF_LOSSES);
+ } break;
+ case 4: {
+ m_text->SetDataType(DATA_PF_CURRENT);
+ } break;
+ case 5: {
+ m_text->SetDataType(DATA_SC_CURRENT);
+ } break;
+ }
+ } break;
+ case TYPE_LOAD:
+ case TYPE_SYNC_MOTOR:
+ case TYPE_IND_MOTOR: {
+ switch(m_choiceTextType->GetSelection()) {
+ case 0: {
+ m_text->SetDataType(DATA_NAME);
+ } break;
+ case 1: {
+ m_text->SetDataType(DATA_PF_ACTIVE);
+ } break;
+ case 2: {
+ m_text->SetDataType(DATA_PF_REACTIVE);
+ } break;
+ }
+ } break;
+ case TYPE_CAPACITOR:
+ case TYPE_INDUCTOR: {
+ switch(m_choiceTextType->GetSelection()) {
+ case 0: {
+ m_text->SetDataType(DATA_NAME);
+ } break;
+ case 1: {
+ m_text->SetDataType(DATA_PF_REACTIVE);
+ } break;
+ }
+ } break;
+ default:
+ break;
+ }
+ DataTypeChoice();
+}
+
void TextForm::ElementTypeChoice()
{
m_choiceName->Clear();
@@ -136,56 +231,42 @@ void TextForm::ElementNumberChoice()
switch(m_text->GetElementType()) {
case TYPE_BUS: {
arrayString.Add(_("Name"));
- arrayString.Add(_("Voltage"));
- arrayString.Add(_("Angle"));
- arrayString.Add(_("Fault current"));
- arrayString.Add(_("Fault voltage"));
- arrayString.Add(_("Short-circuit power"));
+ arrayString.Add(_("Voltage"));
+ arrayString.Add(_("Angle"));
+ arrayString.Add(_("Fault current"));
+ arrayString.Add(_("Fault voltage"));
+ arrayString.Add(_("Short-circuit power"));
} break;
case TYPE_SYNC_GENERATOR: {
arrayString.Add(_("Name"));
- arrayString.Add(_("Active power"));
- arrayString.Add(_("Reactive power"));
- arrayString.Add(_("Fault current"));
- } break;
- case TYPE_LINE: {
- arrayString.Add(_("Name"));
- arrayString.Add(_("Active power flow"));
- arrayString.Add(_("Reactive power flow"));
- arrayString.Add(_("Losses"));
- arrayString.Add(_("Current"));
- arrayString.Add(_("Fault current"));
+ arrayString.Add(_("Active power"));
+ arrayString.Add(_("Reactive power"));
+ arrayString.Add(_("Fault current"));
} break;
+ case TYPE_LINE:
case TYPE_TRANSFORMER: {
arrayString.Add(_("Name"));
- arrayString.Add(_("Active power flow"));
- arrayString.Add(_("Reactive power flow"));
- arrayString.Add(_("Losses"));
- arrayString.Add(_("Current"));
- arrayString.Add(_("Fault current"));
+ arrayString.Add(_("Active power flow"));
+ arrayString.Add(_("Reactive power flow"));
+ arrayString.Add(_("Losses"));
+ arrayString.Add(_("Current"));
+ arrayString.Add(_("Fault current"));
} break;
case TYPE_LOAD: {
arrayString.Add(_("Name"));
- arrayString.Add(_("Active power"));
- arrayString.Add(_("Reactive power"));
- } break;
- case TYPE_CAPACITOR: {
- arrayString.Add(_("Name"));
- arrayString.Add(_("Reactive power"));
+ arrayString.Add(_("Active power"));
+ arrayString.Add(_("Reactive power"));
} break;
+ case TYPE_CAPACITOR:
case TYPE_INDUCTOR: {
arrayString.Add(_("Name"));
- arrayString.Add(_("Reactive power"));
- } break;
- case TYPE_SYNC_MOTOR: {
- arrayString.Add(_("Name"));
- arrayString.Add(_("Active power"));
- arrayString.Add(_("Reactive power"));
+ arrayString.Add(_("Reactive power"));
} break;
+ case TYPE_SYNC_MOTOR:
case TYPE_IND_MOTOR: {
arrayString.Add(_("Name"));
- arrayString.Add(_("Active power"));
- arrayString.Add(_("Reactive power"));
+ arrayString.Add(_("Active power"));
+ arrayString.Add(_("Reactive power"));
} break;
default:
@@ -195,7 +276,107 @@ void TextForm::ElementNumberChoice()
m_choiceTextType->Enable();
}
-void TextForm::DataTypeChoice() {}
+void TextForm::DataTypeChoice()
+{
+ m_choiceTextToBus->Clear();
+ m_choiceTextFromBus->Clear();
+ m_choiceTextUnit->Clear();
+ m_choiceTextUnit->Enable();
+ wxArrayString arrayString;
+ switch(m_text->GetDataType()) {
+ case DATA_NAME: {
+ m_choiceTextUnit->Enable(false);
+ return;
+ } break;
+ case DATA_VOLTAGE:
+ case DATA_SC_VOLTAGE: {
+ arrayString.Add(_("p.u."));
+ arrayString.Add(_("V"));
+ arrayString.Add(_("kV"));
+ } break;
+ case DATA_ANGLE: {
+ arrayString.Add(_("Degrees"));
+ arrayString.Add(_("Radians"));
+ } break;
+ case DATA_SC_CURRENT:
+ case DATA_PF_CURRENT: {
+ arrayString.Add(_("p.u."));
+ arrayString.Add(_("A"));
+ arrayString.Add(_("kA"));
+ } break;
+ case DATA_SC_POWER: {
+ arrayString.Add(_("p.u."));
+ arrayString.Add(_("VA"));
+ arrayString.Add(_("kVA"));
+ arrayString.Add(_("MVA"));
+ } break;
+ case DATA_ACTIVE_POWER:
+ case DATA_PF_ACTIVE:
+ case DATA_PF_LOSSES: {
+ arrayString.Add(_("p.u."));
+ arrayString.Add(_("W"));
+ arrayString.Add(_("kW"));
+ arrayString.Add(_("MW"));
+ m_choiceTextUnit->Enable();
+ } break;
+ case DATA_REACTIVE_POWER:
+ case DATA_PF_REACTIVE: {
+ arrayString.Add(_("p.u."));
+ arrayString.Add(_("VAr"));
+ arrayString.Add(_("kVAr"));
+ arrayString.Add(_("MVAr"));
+ } break;
+ default:
+ break;
+ }
+ m_choiceTextUnit->Append(arrayString);
+
+ switch(m_text->GetElementType()) {
+ case TYPE_LINE: {
+ auto it = m_allElements.GetLineList().begin();
+ std::advance(it, m_text->GetElementNumber());
+ Line* line = *it;
+
+ Bus* bus1 = (Bus*)line->GetParentList()[0];
+ Bus* bus2 = (Bus*)line->GetParentList()[1];
+ wxString bus1Name = bus1->GetEletricalData().name;
+ wxString bus2Name = bus2->GetEletricalData().name;
+
+ m_choiceTextFromBus->Append(bus1Name);
+ m_choiceTextFromBus->Append(bus2Name);
+ m_choiceTextToBus->Append(bus2Name);
+ m_choiceTextToBus->Append(bus1Name);
+ m_choiceTextFromBus->SetSelection(0);
+ m_choiceTextToBus->SetSelection(0);
+
+ m_choiceTextFromBus->Enable();
+ m_choiceTextToBus->Enable();
+ } break;
+ case TYPE_TRANSFORMER: {
+ auto it = m_allElements.GetTransformerList().begin();
+ std::advance(it, m_text->GetElementNumber());
+ Transformer* transformer = *it;
+
+ Bus* bus1 = (Bus*)transformer->GetParentList()[0];
+ Bus* bus2 = (Bus*)transformer->GetParentList()[1];
+ wxString bus1Name = bus1->GetEletricalData().name;
+ wxString bus2Name = bus2->GetEletricalData().name;
+
+ m_choiceTextFromBus->Append(bus1Name);
+ m_choiceTextFromBus->Append(bus2Name);
+ m_choiceTextToBus->Append(bus2Name);
+ m_choiceTextToBus->Append(bus1Name);
+ m_choiceTextFromBus->SetSelection(0);
+ m_choiceTextToBus->SetSelection(0);
+
+ m_choiceTextFromBus->Enable();
+ m_choiceTextToBus->Enable();
+ } break;
+ default:
+ break;
+ }
+}
+
void TextForm::FromChoice() {}
void TextForm::ToChoice() {}
void TextForm::UnitChoice() {}
generated by cgit (git 2.34.1) at 2025-09-27 03:11:55 +0000