diff options
| author | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-10-23 17:35:26 -0200 |
|---|---|---|
| committer | Thales Lima Oliveira <thaleslima.ufu@gmail.com> | 2017-10-23 17:35:26 -0200 |
| commit | 43f947856a6ce58fb5b168680c53fd7652f63f46 (patch) | |
| tree | 161f2e3169ccdd72c48e00fb4ef6bf3d59274c71 /Project/GeneratorStabForm.cpp | |
| parent | b1b026397c58c45c46ca7a525fb1e98b20ddfab8 (diff) | |
| download | PSP.git-43f947856a6ce58fb5b168680c53fd7652f63f46.tar.gz PSP.git-43f947856a6ce58fb5b168680c53fd7652f63f46.tar.xz PSP.git-43f947856a6ce58fb5b168680c53fd7652f63f46.zip | |
Text element reimplemented
Diffstat (limited to 'Project/GeneratorStabForm.cpp')
| -rw-r--r-- | Project/GeneratorStabForm.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Project/GeneratorStabForm.cpp b/Project/GeneratorStabForm.cpp index 0064881..ded927c 100644 --- a/Project/GeneratorStabForm.cpp +++ b/Project/GeneratorStabForm.cpp @@ -74,7 +74,7 @@ void GeneratorStabForm::OnEditAVRButtonClick(wxCommandEvent& event) data.avr = new ControlElementContainer(); m_syncGenerator->SetElectricalData(data); } - ControlEditor* cEditor = new ControlEditor(NULL, IOControl::IN_TERMINAL_VOLTAGE | IOControl::IN_ACTIVE_POWER | + ControlEditor* cEditor = new ControlEditor(m_parent, IOControl::IN_TERMINAL_VOLTAGE | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER | IOControl::IN_INITIAL_TERMINAL_VOLTAGE | IOControl::IN_VELOCITY | IOControl::IN_INITIAL_VELOCITY | IOControl::IN_DELTA_VELOCITY | IOControl::IN_DELTA_ACTIVE_POWER | IOControl::OUT_FIELD_VOLTAGE); @@ -82,7 +82,8 @@ void GeneratorStabForm::OnEditAVRButtonClick(wxCommandEvent& event) cEditor->SetConnectionsList(data.avr->GetConnectionLineList()); cEditor->SetControlContainer(data.avr); cEditor->Show(); - EndModal(wxID_OK); + cEditor->SetJustOpened(true); + //EndModal(wxID_OK); } } @@ -107,7 +108,8 @@ void GeneratorStabForm::OnSpeedGovernorButtonClick(wxCommandEvent& event) cEditor->SetConnectionsList(data.speedGov->GetConnectionLineList()); cEditor->SetControlContainer(data.speedGov); cEditor->Show(); - EndModal(wxID_OK); + cEditor->SetJustOpened(true); + //EndModal(wxID_OK); } } |