Several changes and bugfixes to compile the program on linux (ubuntu-xenial-amb64)

1 files changed, 65 insertions, 56 deletions

diff --git a/Project/GeneratorStabForm.cpp b/Project/GeneratorStabForm.cpp
index 9a468b7..0064881 100644
--- a/Project/GeneratorStabForm.cpp
+++ b/Project/GeneratorStabForm.cpp
@@ -16,12 +16,13 @@
  */
 
 #include "GeneratorStabForm.h"
-#include "SwitchingForm.h"
-#include "SyncGenerator.h"
 #include "ControlEditor.h"
 #include "ControlElementContainer.h"
+#include "SwitchingForm.h"
+#include "SyncGenerator.h"
 
-GeneratorStabForm::GeneratorStabForm(wxWindow* parent, SyncGenerator* syncGenerator) : GeneratorStabFormBase(parent)
+GeneratorStabForm::GeneratorStabForm(wxWindow* parent, SyncGenerator* syncGenerator)
+    : GeneratorStabFormBase(parent)
 {
     SetSize(GetBestSize());
     m_syncGenerator = syncGenerator;
@@ -58,44 +59,56 @@ GeneratorStabForm::GeneratorStabForm(wxWindow* parent, SyncGenerator* syncGenera
     m_textCtrlSubTq0->SetValue(SyncGenerator::StringFromDouble(data.subTq0));
 }
 
-GeneratorStabForm::~GeneratorStabForm() {}
-void GeneratorStabForm::OnCancelButtonClick(wxCommandEvent& event) { EndModal(wxID_CANCEL); }
+GeneratorStabForm::~GeneratorStabForm()
+{
+}
+void GeneratorStabForm::OnCancelButtonClick(wxCommandEvent& event)
+{
+    EndModal(wxID_CANCEL);
+}
 void GeneratorStabForm::OnEditAVRButtonClick(wxCommandEvent& event)
 {
-    SyncGeneratorElectricalData data = m_syncGenerator->GetElectricalData();
-    if(!data.avr) {
-        data.avr = new ControlElementContainer();
-        m_syncGenerator->SetElectricalData(data);
+    if(ValidateData()) {
+        SyncGeneratorElectricalData data = m_syncGenerator->GetElectricalData();
+        if(!data.avr) {
+            data.avr = new ControlElementContainer();
+            m_syncGenerator->SetElectricalData(data);
+        }
+        ControlEditor* cEditor = new ControlEditor(NULL, 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);
+        cEditor->SetElementsList(data.avr->GetControlElementsList());
+        cEditor->SetConnectionsList(data.avr->GetConnectionLineList());
+        cEditor->SetControlContainer(data.avr);
+        cEditor->Show();
+        EndModal(wxID_OK);
     }
-    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);
-    cEditor->SetElementsList(data.avr->GetControlElementsList());
-    cEditor->SetConnectionsList(data.avr->GetConnectionLineList());
-    cEditor->SetControlContainer(data.avr);
-    cEditor->Show();
 }
 
 void GeneratorStabForm::OnOKButtonClick(wxCommandEvent& event)
 {
-    if(ValidateData()) EndModal(wxID_OK);
+    if(ValidateData())
+        EndModal(wxID_OK);
 }
 
 void GeneratorStabForm::OnSpeedGovernorButtonClick(wxCommandEvent& event)
 {
-    SyncGeneratorElectricalData data = m_syncGenerator->GetElectricalData();
-    if(!data.speedGov) {
-        data.speedGov = new ControlElementContainer();
-        m_syncGenerator->SetElectricalData(data);
+    if(ValidateData()) {
+        SyncGeneratorElectricalData data = m_syncGenerator->GetElectricalData();
+        if(!data.speedGov) {
+            data.speedGov = new ControlElementContainer();
+            m_syncGenerator->SetElectricalData(data);
+        }
+        ControlEditor* cEditor =
+            new ControlEditor(NULL, IOControl::IN_VELOCITY | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER |
+                    IOControl::IN_INITIAL_VELOCITY | IOControl::IN_INITIAL_MEC_POWER | IOControl::OUT_MEC_POWER);
+        cEditor->SetElementsList(data.speedGov->GetControlElementsList());
+        cEditor->SetConnectionsList(data.speedGov->GetConnectionLineList());
+        cEditor->SetControlContainer(data.speedGov);
+        cEditor->Show();
+        EndModal(wxID_OK);
     }
-    ControlEditor* cEditor = new ControlEditor(
-        m_parent, IOControl::IN_VELOCITY | IOControl::IN_ACTIVE_POWER | IOControl::IN_REACTIVE_POWER |
-                      IOControl::IN_INITIAL_VELOCITY | IOControl::IN_INITIAL_MEC_POWER | IOControl::OUT_MEC_POWER);
-    cEditor->SetElementsList(data.speedGov->GetControlElementsList());
-    cEditor->SetConnectionsList(data.speedGov->GetConnectionLineList());
-    cEditor->SetControlContainer(data.speedGov);
-    cEditor->Show();
 }
 
 void GeneratorStabForm::OnSwitchingButtonClick(wxCommandEvent& event)
@@ -115,75 +128,65 @@ bool GeneratorStabForm::ValidateData()
     data.plotSyncMachine = m_checkBoxPlotSyncMachine->GetValue();
 
     if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlInertia->GetValue(), data.inertia,
-                                          _("Value entered incorrectly in the field \"Inertia\".")))
+           _("Value entered incorrectly in the field \"Inertia\".")))
         return false;
 
     if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlDamping->GetValue(), data.damping,
-                                          _("Value entered incorrectly in the field \"Damping factor\".")))
+           _("Value entered incorrectly in the field \"Damping factor\".")))
         return false;
 
     data.useAVR = m_checkBoxUseAVR->GetValue();
     data.useSpeedGovernor = m_checkBoxUseSG->GetValue();
 
     if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlRa->GetValue(), data.armResistance,
-                                          _("Value entered incorrectly in the field \"Armature resistance\".")))
+           _("Value entered incorrectly in the field \"Armature resistance\".")))
         return false;
 
     if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlXp->GetValue(), data.potierReactance,
-                                          _("Value entered incorrectly in the field \"Potier reactance\".")))
+           _("Value entered incorrectly in the field \"Potier reactance\".")))
         return false;
 
     if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlSat->GetValue(), data.satFactor,
-                                          _("Value entered incorrectly in the field \"Saturation factor\".")))
+           _("Value entered incorrectly in the field \"Saturation factor\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlSyncXd->GetValue(), data.syncXd,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlSyncXd->GetValue(), data.syncXd,
            _("Value entered incorrectly in the field \"Synchronous direct-axis reactance\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlSyncXq->GetValue(), data.syncXq,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlSyncXq->GetValue(), data.syncXq,
            _("Value entered incorrectly in the field \"Synchronous quadrature-axis reactance\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlTranXd->GetValue(), data.transXd,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlTranXd->GetValue(), data.transXd,
            _("Value entered incorrectly in the field \"Transitory direct-axis reactance\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlTranXq->GetValue(), data.transXq,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlTranXq->GetValue(), data.transXq,
            _("Value entered incorrectly in the field \"Transitory quadrature-axis reactance\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlTranTd0->GetValue(), data.transTd0,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlTranTd0->GetValue(), data.transTd0,
            _("Value entered incorrectly in the field \"Transitory direct-axis time constant\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlTranTq0->GetValue(), data.transTq0,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlTranTq0->GetValue(), data.transTq0,
            _("Value entered incorrectly in the field \"Transitory quadrature-axis time constant\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlSubXd->GetValue(), data.subXd,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlSubXd->GetValue(), data.subXd,
            _("Value entered incorrectly in the field \"Subtransitory direct-axis reactance\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlSubXq->GetValue(), data.subXq,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlSubXq->GetValue(), data.subXq,
            _("Value entered incorrectly in the field \"Subtransitory quadrature-axis reactance\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlSubTd0->GetValue(), data.subTd0,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlSubTd0->GetValue(), data.subTd0,
            _("Value entered incorrectly in the field \"Subtransitory direct-axis time constant\".")))
         return false;
 
-    if(!m_syncGenerator->DoubleFromString(
-           m_parent, m_textCtrlSubTq0->GetValue(), data.subTq0,
+    if(!m_syncGenerator->DoubleFromString(m_parent, m_textCtrlSubTq0->GetValue(), data.subTq0,
            _("Value entered incorrectly in the field \"Subtransitory quadrature-axis time constant\".")))
         return false;
 
@@ -191,5 +194,11 @@ bool GeneratorStabForm::ValidateData()
 
     return true;
 }
-void GeneratorStabForm::UseAVRClick(wxCommandEvent& event) { m_buttonEditAVR->Enable(m_checkBoxUseAVR->GetValue()); }
-void GeneratorStabForm::UseSGClick(wxCommandEvent& event) { m_buttonEditSG->Enable(m_checkBoxUseSG->GetValue()); }
+void GeneratorStabForm::UseAVRClick(wxCommandEvent& event)
+{
+    m_buttonEditAVR->Enable(m_checkBoxUseAVR->GetValue());
+}
+void GeneratorStabForm::UseSGClick(wxCommandEvent& event)
+{
+    m_buttonEditSG->Enable(m_checkBoxUseSG->GetValue());
+}