summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Project/Branch.cpp2
-rw-r--r--Project/Branch.h4
-rw-r--r--Project/Bus.cpp4
-rw-r--r--Project/Bus.h4
-rw-r--r--Project/ControlElement.cpp10
-rw-r--r--Project/ControlElement.h14
-rw-r--r--Project/GraphicalElement.cpp10
-rw-r--r--Project/GraphicalElement.h14
-rw-r--r--Project/Machines.cpp2
-rw-r--r--Project/Machines.h4
-rw-r--r--Project/PowerElement.cpp10
-rw-r--r--Project/PowerElement.h14
-rw-r--r--Project/Project.mk60
-rw-r--r--Project/Project.project38
-rw-r--r--Project/Project.txt2
-rw-r--r--Project/Shunt.cpp2
-rw-r--r--Project/Shunt.h4
-rw-r--r--Project/Text.cpp4
-rw-r--r--Project/Text.h4
19 files changed, 160 insertions, 46 deletions
diff --git a/Project/Branch.cpp b/Project/Branch.cpp
index e971411..326b7e0 100644
--- a/Project/Branch.cpp
+++ b/Project/Branch.cpp
@@ -1,7 +1,7 @@
#include "Branch.h"
Branch::Branch()
- : Element()
+ : PowerElement()
{
}
Branch::~Branch() {}
diff --git a/Project/Branch.h b/Project/Branch.h
index ba7108a..461738f 100644
--- a/Project/Branch.h
+++ b/Project/Branch.h
@@ -1,10 +1,10 @@
#ifndef BRANCH_H
#define BRANCH_H
-#include "Element.h"
+#include "PowerElement.h"
#include "Bus.h"
-class Branch : public Element
+class Branch : public PowerElement
{
public:
Branch();
diff --git a/Project/Bus.cpp b/Project/Bus.cpp
index 4a375ae..9d0de98 100644
--- a/Project/Bus.cpp
+++ b/Project/Bus.cpp
@@ -1,11 +1,11 @@
#include "Bus.h"
Bus::Bus()
- : Element()
+ : PowerElement()
{
}
Bus::Bus(wxPoint2DDouble position)
- : Element()
+ : PowerElement()
{
m_width = 100.0;
m_height = 5.0;
diff --git a/Project/Bus.h b/Project/Bus.h
index c7f66ef..2522be3 100644
--- a/Project/Bus.h
+++ b/Project/Bus.h
@@ -2,7 +2,7 @@
#define BUS_H
#include "BusForm.h"
-#include "Element.h"
+#include "PowerElement.h"
struct BusElectricalData {
int number = 0;
@@ -39,7 +39,7 @@ struct BusElectricalData {
double stabFaultReactance = 0.0;
};
-class Bus : public Element
+class Bus : public PowerElement
{
public:
Bus();
diff --git a/Project/ControlElement.cpp b/Project/ControlElement.cpp
new file mode 100644
index 0000000..d12f9cf
--- /dev/null
+++ b/Project/ControlElement.cpp
@@ -0,0 +1,10 @@
+#include "ControlElement.h"
+
+ControlElement::ControlElement() : Element()
+{
+}
+
+ControlElement::~ControlElement()
+{
+}
+
diff --git a/Project/ControlElement.h b/Project/ControlElement.h
new file mode 100644
index 0000000..69f9d83
--- /dev/null
+++ b/Project/ControlElement.h
@@ -0,0 +1,14 @@
+#ifndef CONTROLELEMENT_H
+#define CONTROLELEMENT_H
+
+#include "Element.h"
+
+class ControlElement : public Element
+{
+public:
+ ControlElement();
+ ~ControlElement();
+
+};
+
+#endif // CONTROLELEMENT_H
diff --git a/Project/GraphicalElement.cpp b/Project/GraphicalElement.cpp
new file mode 100644
index 0000000..87a5302
--- /dev/null
+++ b/Project/GraphicalElement.cpp
@@ -0,0 +1,10 @@
+#include "GraphicalElement.h"
+
+GraphicalElement::GraphicalElement() : Element()
+{
+}
+
+GraphicalElement::~GraphicalElement()
+{
+}
+
diff --git a/Project/GraphicalElement.h b/Project/GraphicalElement.h
new file mode 100644
index 0000000..86ca30d
--- /dev/null
+++ b/Project/GraphicalElement.h
@@ -0,0 +1,14 @@
+#ifndef GRAPHICALELEMENT_H
+#define GRAPHICALELEMENT_H
+
+#include "Element.h"
+
+class GraphicalElement : public Element
+{
+public:
+ GraphicalElement();
+ ~GraphicalElement();
+
+};
+
+#endif // GRAPHICALELEMENT_H
diff --git a/Project/Machines.cpp b/Project/Machines.cpp
index 6016df8..dd93bf1 100644
--- a/Project/Machines.cpp
+++ b/Project/Machines.cpp
@@ -1,7 +1,7 @@
#include "Machines.h"
Machines::Machines()
- : Element()
+ : PowerElement()
{
}
Machines::~Machines() {}
diff --git a/Project/Machines.h b/Project/Machines.h
index cecd78b..8efcab6 100644
--- a/Project/Machines.h
+++ b/Project/Machines.h
@@ -1,9 +1,9 @@
#ifndef MACHINES_H
#define MACHINES_H
-#include "Element.h"
+#include "PowerElement.h"
-class Machines : public Element
+class Machines : public PowerElement
{
public:
Machines();
diff --git a/Project/PowerElement.cpp b/Project/PowerElement.cpp
new file mode 100644
index 0000000..c9492f6
--- /dev/null
+++ b/Project/PowerElement.cpp
@@ -0,0 +1,10 @@
+#include "PowerElement.h"
+
+PowerElement::PowerElement() : Element()
+{
+}
+
+PowerElement::~PowerElement()
+{
+}
+
diff --git a/Project/PowerElement.h b/Project/PowerElement.h
new file mode 100644
index 0000000..6fdc33e
--- /dev/null
+++ b/Project/PowerElement.h
@@ -0,0 +1,14 @@
+#ifndef POWERELEMENT_H
+#define POWERELEMENT_H
+
+#include "Element.h"
+
+class PowerElement : public Element
+{
+public:
+ PowerElement();
+ ~PowerElement();
+
+};
+
+#endif // POWERELEMENT_H
diff --git a/Project/Project.mk b/Project/Project.mk
index bdb44b1..8c584c6 100644
--- a/Project/Project.mk
+++ b/Project/Project.mk
@@ -64,11 +64,11 @@ AS := C:/TDM-GCC-64/bin/as.exe
CodeLiteDir:=C:\Program Files\CodeLite
WXWIN:=C:\wxWidgets-3.1.0
WXCFG:=gcc_dll\mswu
-Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxGLString.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) \
+Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxGLString.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) \
$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IntermediateDirectory)/Transformer.cpp$(ObjectSuffix) $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) \
- $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) \
- $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) \
- $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix)
+ $(IntermediateDirectory)/SyncGenerator.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Shunt.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) \
+ $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/GeneratorStabForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/LineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SwitchingForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransformerForm.cpp$(ObjectSuffix) \
+ $(IntermediateDirectory)/LoadForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ReactiveShuntElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotorForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/SyncMachineForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/TextForm.cpp$(ObjectSuffix)
@@ -109,14 +109,6 @@ $(IntermediateDirectory)/main.cpp$(PreprocessSuffix): main.cpp
$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix): win_resources.rc
$(RcCompilerName) -i "C:/Users/Thales/Documents/GitHub/PSP/Project/win_resources.rc" $(RcCmpOptions) $(ObjectSwitch)$(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(RcIncludePath)
-$(IntermediateDirectory)/Text.cpp$(ObjectSuffix): Text.cpp $(IntermediateDirectory)/Text.cpp$(DependSuffix)
- $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Text.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/Text.cpp$(DependSuffix): Text.cpp
- @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Text.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Text.cpp$(DependSuffix) -MM Text.cpp
-
-$(IntermediateDirectory)/Text.cpp$(PreprocessSuffix): Text.cpp
- $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Text.cpp$(PreprocessSuffix) Text.cpp
-
$(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix): ElementDataObject.cpp $(IntermediateDirectory)/ElementDataObject.cpp$(DependSuffix)
$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ElementDataObject.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IncludePath)
$(IntermediateDirectory)/ElementDataObject.cpp$(DependSuffix): ElementDataObject.cpp
@@ -125,6 +117,14 @@ $(IntermediateDirectory)/ElementDataObject.cpp$(DependSuffix): ElementDataObject
$(IntermediateDirectory)/ElementDataObject.cpp$(PreprocessSuffix): ElementDataObject.cpp
$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementDataObject.cpp$(PreprocessSuffix) ElementDataObject.cpp
+$(IntermediateDirectory)/Element.cpp$(ObjectSuffix): Element.cpp $(IntermediateDirectory)/Element.cpp$(DependSuffix)
+ $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Element.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/Element.cpp$(DependSuffix): Element.cpp
+ @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Element.cpp$(DependSuffix) -MM Element.cpp
+
+$(IntermediateDirectory)/Element.cpp$(PreprocessSuffix): Element.cpp
+ $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Element.cpp$(PreprocessSuffix) Element.cpp
+
$(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix): ArtMetro.cpp $(IntermediateDirectory)/ArtMetro.cpp$(DependSuffix)
$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ArtMetro.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IncludePath)
$(IntermediateDirectory)/ArtMetro.cpp$(DependSuffix): ArtMetro.cpp
@@ -317,13 +317,13 @@ $(IntermediateDirectory)/Capacitor.cpp$(DependSuffix): Capacitor.cpp
$(IntermediateDirectory)/Capacitor.cpp$(PreprocessSuffix): Capacitor.cpp
$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Capacitor.cpp$(PreprocessSuffix) Capacitor.cpp
-$(IntermediateDirectory)/Element.cpp$(ObjectSuffix): Element.cpp $(IntermediateDirectory)/Element.cpp$(DependSuffix)
- $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Element.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IncludePath)
-$(IntermediateDirectory)/Element.cpp$(DependSuffix): Element.cpp
- @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Element.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Element.cpp$(DependSuffix) -MM Element.cpp
+$(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix): PowerElement.cpp $(IntermediateDirectory)/PowerElement.cpp$(DependSuffix)
+ $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/PowerElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/PowerElement.cpp$(DependSuffix): PowerElement.cpp
+ @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PowerElement.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PowerElement.cpp$(DependSuffix) -MM PowerElement.cpp
-$(IntermediateDirectory)/Element.cpp$(PreprocessSuffix): Element.cpp
- $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Element.cpp$(PreprocessSuffix) Element.cpp
+$(IntermediateDirectory)/PowerElement.cpp$(PreprocessSuffix): PowerElement.cpp
+ $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PowerElement.cpp$(PreprocessSuffix) PowerElement.cpp
$(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix): ElectricCalculation.cpp $(IntermediateDirectory)/ElectricCalculation.cpp$(DependSuffix)
$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ElectricCalculation.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IncludePath)
@@ -349,6 +349,30 @@ $(IntermediateDirectory)/Fault.cpp$(DependSuffix): Fault.cpp
$(IntermediateDirectory)/Fault.cpp$(PreprocessSuffix): Fault.cpp
$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Fault.cpp$(PreprocessSuffix) Fault.cpp
+$(IntermediateDirectory)/Text.cpp$(ObjectSuffix): Text.cpp $(IntermediateDirectory)/Text.cpp$(DependSuffix)
+ $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/Text.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/Text.cpp$(DependSuffix): Text.cpp
+ @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/Text.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/Text.cpp$(DependSuffix) -MM Text.cpp
+
+$(IntermediateDirectory)/Text.cpp$(PreprocessSuffix): Text.cpp
+ $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/Text.cpp$(PreprocessSuffix) Text.cpp
+
+$(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix): GraphicalElement.cpp $(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix)
+ $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/GraphicalElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix): GraphicalElement.cpp
+ @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/GraphicalElement.cpp$(DependSuffix) -MM GraphicalElement.cpp
+
+$(IntermediateDirectory)/GraphicalElement.cpp$(PreprocessSuffix): GraphicalElement.cpp
+ $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/GraphicalElement.cpp$(PreprocessSuffix) GraphicalElement.cpp
+
+$(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix): ControlElement.cpp $(IntermediateDirectory)/ControlElement.cpp$(DependSuffix)
+ $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/ControlElement.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IncludePath)
+$(IntermediateDirectory)/ControlElement.cpp$(DependSuffix): ControlElement.cpp
+ @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlElement.cpp$(DependSuffix) -MM ControlElement.cpp
+
+$(IntermediateDirectory)/ControlElement.cpp$(PreprocessSuffix): ControlElement.cpp
+ $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlElement.cpp$(PreprocessSuffix) ControlElement.cpp
+
$(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix): BusForm.cpp $(IntermediateDirectory)/BusForm.cpp$(DependSuffix)
$(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/Thales/Documents/GitHub/PSP/Project/BusForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/BusForm.cpp$(ObjectSuffix) $(IncludePath)
$(IntermediateDirectory)/BusForm.cpp$(DependSuffix): BusForm.cpp
diff --git a/Project/Project.project b/Project/Project.project
index 7e8c41f..38e449f 100644
--- a/Project/Project.project
+++ b/Project/Project.project
@@ -10,7 +10,7 @@
<Dependencies/>
<VirtualDirectory Name="src">
<VirtualDirectory Name="model">
- <VirtualDirectory Name="electrical">
+ <VirtualDirectory Name="power element">
<File Name="Bus.cpp"/>
<File Name="Line.cpp"/>
<File Name="Transformer.cpp"/>
@@ -23,15 +23,22 @@
<File Name="Load.cpp"/>
<File Name="Inductor.cpp"/>
<File Name="Capacitor.cpp"/>
- <File Name="Element.cpp"/>
+ <File Name="PowerElement.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="calculations">
<File Name="ElectricCalculation.cpp"/>
<File Name="PowerFlow.cpp"/>
<File Name="Fault.cpp"/>
</VirtualDirectory>
- <File Name="Text.cpp"/>
<File Name="ElementDataObject.cpp"/>
+ <VirtualDirectory Name="graphical element">
+ <File Name="Text.cpp"/>
+ <File Name="GraphicalElement.cpp"/>
+ </VirtualDirectory>
+ <File Name="Element.cpp"/>
+ <VirtualDirectory Name="control element">
+ <File Name="ControlElement.cpp"/>
+ </VirtualDirectory>
</VirtualDirectory>
<VirtualDirectory Name="view">
<File Name="ArtMetro.cpp"/>
@@ -40,7 +47,7 @@
<VirtualDirectory Name="controller">
<File Name="MainFrame.cpp"/>
<File Name="Workspace.cpp"/>
- <VirtualDirectory Name="element forms">
+ <VirtualDirectory Name="power element form">
<File Name="BusForm.cpp"/>
<File Name="GeneratorStabForm.cpp"/>
<File Name="LineForm.cpp"/>
@@ -50,15 +57,17 @@
<File Name="ReactiveShuntElementForm.cpp"/>
<File Name="IndMotorForm.cpp"/>
<File Name="SyncMachineForm.cpp"/>
- <File Name="TextForm.cpp"/>
</VirtualDirectory>
<File Name="FileHanding.cpp"/>
+ <VirtualDirectory Name="graphical element form">
+ <File Name="TextForm.cpp"/>
+ </VirtualDirectory>
</VirtualDirectory>
<File Name="main.cpp"/>
</VirtualDirectory>
<VirtualDirectory Name="include">
<VirtualDirectory Name="model">
- <VirtualDirectory Name="electrical">
+ <VirtualDirectory Name="power element">
<File Name="Bus.h"/>
<File Name="Line.h"/>
<File Name="Transformer.h"/>
@@ -71,14 +80,13 @@
<File Name="Load.h"/>
<File Name="Inductor.h"/>
<File Name="Capacitor.h"/>
- <File Name="Element.h"/>
+ <File Name="PowerElement.h"/>
</VirtualDirectory>
<VirtualDirectory Name="calculations">
<File Name="ElectricCalculation.h"/>
<File Name="PowerFlow.h"/>
<File Name="Fault.h"/>
</VirtualDirectory>
- <File Name="Text.h"/>
<VirtualDirectory Name="rapidXML">
<File Name="rapidXML/rapidxml.hpp"/>
<File Name="rapidXML/rapidxml_iterators.hpp"/>
@@ -86,6 +94,14 @@
<File Name="rapidXML/rapidxml_utils.hpp"/>
</VirtualDirectory>
<File Name="ElementDataObject.h"/>
+ <File Name="Element.h"/>
+ <VirtualDirectory Name="graphical element">
+ <File Name="Text.h"/>
+ <File Name="GraphicalElement.h"/>
+ </VirtualDirectory>
+ <VirtualDirectory Name="control element">
+ <File Name="ControlElement.h"/>
+ </VirtualDirectory>
</VirtualDirectory>
<VirtualDirectory Name="view">
<File Name="ArtMetro.h"/>
@@ -94,7 +110,7 @@
<VirtualDirectory Name="controller">
<File Name="MainFrame.h"/>
<File Name="Workspace.h"/>
- <VirtualDirectory Name="element forms">
+ <VirtualDirectory Name="power element form">
<File Name="BusForm.h"/>
<File Name="GeneratorStabForm.h"/>
<File Name="LineForm.h"/>
@@ -104,9 +120,11 @@
<File Name="ReactiveShuntElementForm.h"/>
<File Name="IndMotorForm.h"/>
<File Name="SyncMachineForm.h"/>
- <File Name="TextForm.h"/>
</VirtualDirectory>
<File Name="FileHanding.h"/>
+ <VirtualDirectory Name="graphical element form">
+ <File Name="TextForm.h"/>
+ </VirtualDirectory>
</VirtualDirectory>
</VirtualDirectory>
<VirtualDirectory Name="resources">
diff --git a/Project/Project.txt b/Project/Project.txt
index 59652ad..86d63a5 100644
--- a/Project/Project.txt
+++ b/Project/Project.txt
@@ -1 +1 @@
-./Release/main.cpp.o ./Release/win_resources.rc.o ./Release/Text.cpp.o ./Release/ElementDataObject.cpp.o ./Release/ArtMetro.cpp.o ./Release/wxGLString.cpp.o ./Release/MainFrame.cpp.o ./Release/Workspace.cpp.o ./Release/FileHanding.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/BusFormBitmaps.cpp.o ./Release/ElementFormBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o ./Release/ElementForm.cpp.o ./Release/Bus.cpp.o ./Release/Line.cpp.o ./Release/Transformer.cpp.o ./Release/Machines.cpp.o ./Release/SyncGenerator.cpp.o ./Release/IndMotor.cpp.o ./Release/Branch.cpp.o ./Release/SyncMotor.cpp.o ./Release/Shunt.cpp.o ./Release/Load.cpp.o ./Release/Inductor.cpp.o ./Release/Capacitor.cpp.o ./Release/Element.cpp.o ./Release/ElectricCalculation.cpp.o ./Release/PowerFlow.cpp.o ./Release/Fault.cpp.o ./Release/BusForm.cpp.o ./Release/GeneratorStabForm.cpp.o ./Release/LineForm.cpp.o ./Release/SwitchingForm.cpp.o ./Release/TransformerForm.cpp.o ./Release/LoadForm.cpp.o ./Release/ReactiveShuntElementForm.cpp.o ./Release/IndMotorForm.cpp.o ./Release/SyncMachineForm.cpp.o ./Release/TextForm.cpp.o
+./Release/main.cpp.o ./Release/win_resources.rc.o ./Release/ElementDataObject.cpp.o ./Release/Element.cpp.o ./Release/ArtMetro.cpp.o ./Release/wxGLString.cpp.o ./Release/MainFrame.cpp.o ./Release/Workspace.cpp.o ./Release/FileHanding.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/BusFormBitmaps.cpp.o ./Release/ElementFormBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o ./Release/ElementForm.cpp.o ./Release/Bus.cpp.o ./Release/Line.cpp.o ./Release/Transformer.cpp.o ./Release/Machines.cpp.o ./Release/SyncGenerator.cpp.o ./Release/IndMotor.cpp.o ./Release/Branch.cpp.o ./Release/SyncMotor.cpp.o ./Release/Shunt.cpp.o ./Release/Load.cpp.o ./Release/Inductor.cpp.o ./Release/Capacitor.cpp.o ./Release/PowerElement.cpp.o ./Release/ElectricCalculation.cpp.o ./Release/PowerFlow.cpp.o ./Release/Fault.cpp.o ./Release/Text.cpp.o ./Release/GraphicalElement.cpp.o ./Release/ControlElement.cpp.o ./Release/BusForm.cpp.o ./Release/GeneratorStabForm.cpp.o ./Release/LineForm.cpp.o ./Release/SwitchingForm.cpp.o ./Release/TransformerForm.cpp.o ./Release/LoadForm.cpp.o ./Release/ReactiveShuntElementForm.cpp.o ./Release/IndMotorForm.cpp.o ./Release/SyncMachineForm.cpp.o ./Release/TextForm.cpp.o
diff --git a/Project/Shunt.cpp b/Project/Shunt.cpp
index 0cd5736..a0caab7 100644
--- a/Project/Shunt.cpp
+++ b/Project/Shunt.cpp
@@ -1,6 +1,6 @@
#include "Shunt.h"
-Shunt::Shunt() : Element() {}
+Shunt::Shunt() : PowerElement() {}
Shunt::~Shunt() {}
void Shunt::UpdateSwitchesPosition()
{
diff --git a/Project/Shunt.h b/Project/Shunt.h
index f68df4b..15b8efb 100644
--- a/Project/Shunt.h
+++ b/Project/Shunt.h
@@ -1,10 +1,10 @@
#ifndef SHUNT_H
#define SHUNT_H
-#include "Element.h"
+#include "PowerElement.h"
#include "Bus.h"
-class Shunt : public Element
+class Shunt : public PowerElement
{
public:
Shunt();
diff --git a/Project/Text.cpp b/Project/Text.cpp
index 8c76956..588e9a1 100644
--- a/Project/Text.cpp
+++ b/Project/Text.cpp
@@ -13,12 +13,12 @@
#include "Capacitor.h"
Text::Text()
- : Element()
+ : GraphicalElement()
{
SetText(m_text);
}
Text::Text(wxPoint2DDouble position)
- : Element()
+ : GraphicalElement()
{
m_position = position;
SetText(m_text);
diff --git a/Project/Text.h b/Project/Text.h
index 019f765..871af2f 100644
--- a/Project/Text.h
+++ b/Project/Text.h
@@ -1,7 +1,7 @@
#ifndef TEXT_H
#define TEXT_H
-#include "Element.h"
+#include "GraphicalElement.h"
#include "wxGLString.h"
class TextForm;
@@ -44,7 +44,7 @@ enum DataType {
DATA_PF_CURRENT
};
-class Text : public Element
+class Text : public GraphicalElement
{
public:
Text();
generated by cgit (git 2.34.1) at 2025-07-25 12:23:58 +0000