diff options
author | Thales1330 <thaleslima.ufu@gmail.com> | 2016-11-30 20:09:32 -0200 |
---|---|---|
committer | Thales1330 <thaleslima.ufu@gmail.com> | 2016-11-30 20:09:32 -0200 |
commit | 186e9d36f23ebb4c260885215d216d4df0b3b2ec (patch) | |
tree | 14256f24bb8aa54f96c2d05a304ba25b962db1d2 /Project | |
parent | 6b9054f1bb28b4ac1b0a7b682204baa0e2643220 (diff) | |
download | PSP.git-186e9d36f23ebb4c260885215d216d4df0b3b2ec.tar.gz PSP.git-186e9d36f23ebb4c260885215d216d4df0b3b2ec.tar.xz PSP.git-186e9d36f23ebb4c260885215d216d4df0b3b2ec.zip |
Text form under implementation [2]
Diffstat (limited to 'Project')
-rw-r--r-- | Project/Project.mk | 2 | ||||
-rw-r--r-- | Project/Release/PSP-UFU.exe | bin | 4191127 -> 4204969 bytes | |||
-rw-r--r-- | Project/Release/TextForm.cpp.o | bin | 116147 -> 133507 bytes | |||
-rw-r--r-- | Project/TextForm.cpp | 255 |
4 files changed, 219 insertions, 38 deletions
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 Binary files differindex d665b65..545a547 100644 --- a/Project/Release/PSP-UFU.exe +++ b/Project/Release/PSP-UFU.exe diff --git a/Project/Release/TextForm.cpp.o b/Project/Release/TextForm.cpp.o Binary files differindex eaa0a65..39968df 100644 --- a/Project/Release/TextForm.cpp.o +++ b/Project/Release/TextForm.cpp.o 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() {} |