diff options
Diffstat (limited to 'Project')
| -rw-r--r-- | Project/AboutForm.h | 2 | ||||
| -rw-r--r-- | Project/BusForm.h | 2 | ||||
| -rw-r--r-- | Project/ChartView.h | 2 | ||||
| -rw-r--r-- | Project/ChartView.wxcp | 2 | ||||
| -rw-r--r-- | Project/ConstantForm.h | 2 | ||||
| -rw-r--r-- | Project/ControlEditor.h | 2 | ||||
| -rw-r--r-- | Project/ControlEditor.wxcp | 2 | ||||
| -rw-r--r-- | Project/ControlSystemTest.h | 2 | ||||
| -rw-r--r-- | Project/DataReport.h | 2 | ||||
| -rw-r--r-- | Project/DataReport.wxcp | 2 | ||||
| -rw-r--r-- | Project/ElementForm.wxcp | 4 | ||||
| -rw-r--r-- | Project/ExponentialForm.h | 2 | ||||
| -rw-r--r-- | Project/GainForm.h | 2 | ||||
| -rw-r--r-- | Project/GeneralPropertiesForm.h | 2 | ||||
| -rw-r--r-- | Project/GeneratorStabForm.h | 2 | ||||
| -rw-r--r-- | Project/IOControlForm.h | 2 | ||||
| -rw-r--r-- | Project/IndMotorForm.h | 2 | ||||
| -rw-r--r-- | Project/LimiterForm.h | 2 | ||||
| -rw-r--r-- | Project/LineForm.h | 2 | ||||
| -rw-r--r-- | Project/LoadForm.h | 2 | ||||
| -rw-r--r-- | Project/MainFrame.cpp | 2 | ||||
| -rw-r--r-- | Project/MainFrame.h | 2 | ||||
| -rw-r--r-- | Project/MainFrame.wxcp | 2 | ||||
| -rw-r--r-- | Project/Project.mk | 200 | ||||
| -rw-r--r-- | Project/Project.project | 98 | ||||
| -rw-r--r-- | Project/Project.txt | 2 | ||||
| -rw-r--r-- | Project/PropertiesForm.wxcp | 4 | ||||
| -rw-r--r-- | Project/RateLimiterForm.h | 2 | ||||
| -rw-r--r-- | Project/ReactiveShuntElementForm.h | 2 | ||||
| -rw-r--r-- | Project/SimulationsSettingsForm.h | 2 | ||||
| -rw-r--r-- | Project/SumForm.h | 2 | ||||
| -rw-r--r-- | Project/SwitchingForm.h | 2 | ||||
| -rw-r--r-- | Project/SyncMachineForm.h | 2 | ||||
| -rw-r--r-- | Project/TextForm.h | 2 | ||||
| -rw-r--r-- | Project/TransferFunctionForm.h | 2 | ||||
| -rw-r--r-- | Project/TransformerForm.h | 2 | ||||
| -rw-r--r-- | Project/Workspace.h | 2 | ||||
| -rw-r--r-- | Project/Workspace.wxcp | 776 | ||||
| -rw-r--r-- | Project/artProvider/ArtMetro.cpp (renamed from Project/ArtMetro.cpp) | 0 | ||||
| -rw-r--r-- | Project/artProvider/ArtMetro.h (renamed from Project/ArtMetro.h) | 0 | ||||
| -rw-r--r-- | Project/base/ChartViewBase.cpp (renamed from Project/ChartViewBase.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/ChartViewBase.h (renamed from Project/ChartViewBase.h) | 0 | ||||
| -rw-r--r-- | Project/base/ChartViewBitmaps.cpp (renamed from Project/ChartViewBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/ControlEditorBase.cpp (renamed from Project/ControlEditorBase.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/ControlEditorBase.h (renamed from Project/ControlEditorBase.h) | 0 | ||||
| -rw-r--r-- | Project/base/ControlEditorBitmaps.cpp (renamed from Project/ControlEditorBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/DataReportBase.cpp (renamed from Project/DataReportBase.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/DataReportBase.h (renamed from Project/DataReportBase.h) | 0 | ||||
| -rw-r--r-- | Project/base/DataReportBitmaps.cpp (renamed from Project/DataReportBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/ElementFormBase.cpp (renamed from Project/ElementForm.cpp) | 2 | ||||
| -rw-r--r-- | Project/base/ElementFormBase.h (renamed from Project/ElementForm.h) | 0 | ||||
| -rw-r--r-- | Project/base/ElementFormBitmaps.cpp (renamed from Project/ElementFormBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/MainFrameBase.cpp (renamed from Project/MainFrameBase.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/MainFrameBase.h (renamed from Project/MainFrameBase.h) | 62 | ||||
| -rw-r--r-- | Project/base/MainFrameBitmaps.cpp (renamed from Project/MainFrameBitmaps.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/PropertiesFormBase.cpp (renamed from Project/PropertiesForm.cpp) | 2 | ||||
| -rw-r--r-- | Project/base/PropertiesFormBase.h (renamed from Project/PropertiesForm.h) | 0 | ||||
| -rw-r--r-- | Project/base/PropertiesFormBitmaps.cpp (renamed from Project/PropertiesFormBitmaps.cpp) | 4 | ||||
| -rw-r--r-- | Project/base/WorkspaceBase.cpp (renamed from Project/WorkspaceBase.cpp) | 0 | ||||
| -rw-r--r-- | Project/base/WorkspaceBase.h (renamed from Project/WorkspaceBase.h) | 0 | ||||
| -rw-r--r-- | Project/base/WorkspaceBitmaps.cpp (renamed from Project/WorkspaceBitmaps.cpp) | 4 |
61 files changed, 633 insertions, 589 deletions
diff --git a/Project/AboutForm.h b/Project/AboutForm.h index 90a43b1..0ab9d9b 100644 --- a/Project/AboutForm.h +++ b/Project/AboutForm.h @@ -17,7 +17,7 @@ #ifndef ABOUTFORM_H #define ABOUTFORM_H -#include "PropertiesForm.h" +#include "base/PropertiesFormBase.h" #include <wx/textfile.h> #include <wx/stdpaths.h> diff --git a/Project/BusForm.h b/Project/BusForm.h index cbbe430..14509d1 100644 --- a/Project/BusForm.h +++ b/Project/BusForm.h @@ -18,7 +18,7 @@ #ifndef BUSFORM_H #define BUSFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class Bus; /** diff --git a/Project/ChartView.h b/Project/ChartView.h index 82bb621..b5d1766 100644 --- a/Project/ChartView.h +++ b/Project/ChartView.h @@ -17,7 +17,7 @@ #ifndef CHARTVIEW_H #define CHARTVIEW_H -#include "ChartViewBase.h" +#include "base/ChartViewBase.h" #include "wxMathPlot/mathplot.h" #include <wx/msgdlg.h> diff --git a/Project/ChartView.wxcp b/Project/ChartView.wxcp index db8c3a2..0bc8535 100644 --- a/Project/ChartView.wxcp +++ b/Project/ChartView.wxcp @@ -1,6 +1,6 @@ { "metadata": { - "m_generatedFilesDir": ".", + "m_generatedFilesDir": "base/", "m_objCounter": 82, "m_includeFiles": [], "m_bitmapFunction": "wxCE3EBInitBitmapResources", diff --git a/Project/ConstantForm.h b/Project/ConstantForm.h index ab91a55..9f6be38 100644 --- a/Project/ConstantForm.h +++ b/Project/ConstantForm.h @@ -17,7 +17,7 @@ #ifndef CONSTANTFORM_H #define CONSTANTFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class Constant; diff --git a/Project/ControlEditor.h b/Project/ControlEditor.h index 8ed29f4..615ecce 100644 --- a/Project/ControlEditor.h +++ b/Project/ControlEditor.h @@ -18,7 +18,7 @@ #ifndef CONTROLEDITOR_H #define CONTROLEDITOR_H -#include "ControlEditorBase.h" +#include "base/ControlEditorBase.h" #include <wx/wrapsizer.h> #include <wx/dcclient.h> #include <wx/dcscreen.h> diff --git a/Project/ControlEditor.wxcp b/Project/ControlEditor.wxcp index d83f53c..5b811cc 100644 --- a/Project/ControlEditor.wxcp +++ b/Project/ControlEditor.wxcp @@ -1,6 +1,6 @@ { "metadata": { - "m_generatedFilesDir": ".", + "m_generatedFilesDir": "base/", "m_objCounter": 423, "m_includeFiles": [], "m_bitmapFunction": "wxC870InitBitmapResources", diff --git a/Project/ControlSystemTest.h b/Project/ControlSystemTest.h index e82caac..2537517 100644 --- a/Project/ControlSystemTest.h +++ b/Project/ControlSystemTest.h @@ -18,7 +18,7 @@ #ifndef CONTROLSYSTEMTEST_H #define CONTROLSYSTEMTEST_H -#include "ControlEditorBase.h" +#include "base/ControlEditorBase.h" class ControlEditor; diff --git a/Project/DataReport.h b/Project/DataReport.h index 6babdf2..8f35a1b 100644 --- a/Project/DataReport.h +++ b/Project/DataReport.h @@ -18,7 +18,7 @@ #ifndef DATAREPORT_H #define DATAREPORT_H -#include "DataReportBase.h" +#include "base/DataReportBase.h" class Workspace; class ElectricCalculation; diff --git a/Project/DataReport.wxcp b/Project/DataReport.wxcp index 7e875e8..3dc0a87 100644 --- a/Project/DataReport.wxcp +++ b/Project/DataReport.wxcp @@ -1,6 +1,6 @@ { "metadata": { - "m_generatedFilesDir": ".", + "m_generatedFilesDir": "base/", "m_objCounter": 85, "m_includeFiles": [], "m_bitmapFunction": "wxC6A63InitBitmapResources", diff --git a/Project/ElementForm.wxcp b/Project/ElementForm.wxcp index 2f5a4a7..b9d19e1 100644 --- a/Project/ElementForm.wxcp +++ b/Project/ElementForm.wxcp @@ -1,12 +1,12 @@ { "metadata": { - "m_generatedFilesDir": ".", + "m_generatedFilesDir": "base/", "m_objCounter": 1932, "m_includeFiles": [], "m_bitmapFunction": "wxC9EE9InitBitmapResources", "m_bitmapsFile": "ElementFormBitmaps.cpp", "m_GenerateCodeTypes": 1, - "m_outputFileName": "ElementForm", + "m_outputFileName": "ElementFormBase", "m_firstWindowId": 10000, "m_useEnum": true, "m_useUnderscoreMacro": true, diff --git a/Project/ExponentialForm.h b/Project/ExponentialForm.h index 7459be7..f911759 100644 --- a/Project/ExponentialForm.h +++ b/Project/ExponentialForm.h @@ -17,7 +17,7 @@ #ifndef EXPONENTIALFORM_H #define EXPONENTIALFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class Exponential; diff --git a/Project/GainForm.h b/Project/GainForm.h index 32bc629..fdab652 100644 --- a/Project/GainForm.h +++ b/Project/GainForm.h @@ -17,7 +17,7 @@ #ifndef GAINFORM_H #define GAINFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class Gain; diff --git a/Project/GeneralPropertiesForm.h b/Project/GeneralPropertiesForm.h index f1d4382..dae4dc9 100644 --- a/Project/GeneralPropertiesForm.h +++ b/Project/GeneralPropertiesForm.h @@ -18,7 +18,7 @@ #ifndef GENERALPROPERTIESFORM_H #define GENERALPROPERTIESFORM_H -#include "PropertiesForm.h" +#include "base/PropertiesFormBase.h" #include <wx/textfile.h> #include <wx/msgdlg.h> diff --git a/Project/GeneratorStabForm.h b/Project/GeneratorStabForm.h index 86aab5b..57d9a5c 100644 --- a/Project/GeneratorStabForm.h +++ b/Project/GeneratorStabForm.h @@ -18,7 +18,7 @@ #ifndef GENERATORSTABFORM_H #define GENERATORSTABFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class SwitchingForm; class SyncGenerator; diff --git a/Project/IOControlForm.h b/Project/IOControlForm.h index a1c3d36..161e793 100644 --- a/Project/IOControlForm.h +++ b/Project/IOControlForm.h @@ -18,7 +18,7 @@ #ifndef IOCONTROLFORM_H #define IOCONTROLFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" #include "IOControl.h" /** diff --git a/Project/IndMotorForm.h b/Project/IndMotorForm.h index ffdd742..efbe0bf 100644 --- a/Project/IndMotorForm.h +++ b/Project/IndMotorForm.h @@ -17,7 +17,7 @@ #ifndef INDMOTORFORM_H #define INDMOTORFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class IndMotor; diff --git a/Project/LimiterForm.h b/Project/LimiterForm.h index 96deb61..5657cb8 100644 --- a/Project/LimiterForm.h +++ b/Project/LimiterForm.h @@ -17,7 +17,7 @@ #ifndef LIMITERFORM_H #define LIMITERFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class Limiter; diff --git a/Project/LineForm.h b/Project/LineForm.h index f80eafa..ab4b87e 100644 --- a/Project/LineForm.h +++ b/Project/LineForm.h @@ -17,7 +17,7 @@ #ifndef LINEFORM_H #define LINEFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class Line; class SwitchingForm; diff --git a/Project/LoadForm.h b/Project/LoadForm.h index 7fedf28..4e50b4e 100644 --- a/Project/LoadForm.h +++ b/Project/LoadForm.h @@ -17,7 +17,7 @@ #ifndef LOADFORM_H #define LOADFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class Load; class SwitchingForm; diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 2c94a22..41fe59b 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -16,7 +16,7 @@ */ #include "MainFrame.h" -#include "ArtMetro.h" +#include "artProvider/ArtMetro.h" #include "Workspace.h" #include "Bus.h" #include "Line.h" diff --git a/Project/MainFrame.h b/Project/MainFrame.h index 036c501..9d0aede 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -23,7 +23,7 @@ #include <wx/filedlg.h> #include <wx/glcanvas.h> -#include "MainFrameBase.h" +#include "base/MainFrameBase.h" class MainFrameBase; class wxRibbonMetroArtProvider; diff --git a/Project/MainFrame.wxcp b/Project/MainFrame.wxcp index 38f0642..ee0d33c 100644 --- a/Project/MainFrame.wxcp +++ b/Project/MainFrame.wxcp @@ -1,6 +1,6 @@ { "metadata": { - "m_generatedFilesDir": ".", + "m_generatedFilesDir": "base/", "m_objCounter": 150, "m_includeFiles": [], "m_bitmapFunction": "wxC9ED9InitBitmapResources", diff --git a/Project/Project.mk b/Project/Project.mk index 8784e76..41dead0 100644 --- a/Project/Project.mk +++ b/Project/Project.mk @@ -13,7 +13,7 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=NDSE-69 -Date :=08/11/2017 +Date :=09/11/2017 CodeLitePath :="C:/Program Files/CodeLite" LinkerName :=C:/TDM-GCC-64/bin/g++.exe SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC @@ -64,9 +64,9 @@ 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)/PropertiesData.cpp$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/PropertiesForm.cpp$(ObjectSuffix) $(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix) \ - $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) \ +Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/PropertiesData.cpp$(ObjectSuffix) $(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix) $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) \ + $(IntermediateDirectory)/PowerFlow.cpp$(ObjectSuffix) $(IntermediateDirectory)/Fault.cpp$(ObjectSuffix) $(IntermediateDirectory)/Electromechanical.cpp$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementDataObject.cpp$(ObjectSuffix) $(IntermediateDirectory)/ElementPlotData.cpp$(ObjectSuffix) $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(ObjectSuffix) $(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) \ $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/ChartView.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlEditor.cpp$(ObjectSuffix) $(IntermediateDirectory)/DataReport.cpp$(ObjectSuffix) $(IntermediateDirectory)/FileHanding.cpp$(ObjectSuffix) $(IntermediateDirectory)/ConnectionLine.cpp$(ObjectSuffix) $(IntermediateDirectory)/Constant.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElementContainer.cpp$(ObjectSuffix) $(IntermediateDirectory)/ControlElementSolver.cpp$(ObjectSuffix) \ $(IntermediateDirectory)/Exponential.cpp$(ObjectSuffix) $(IntermediateDirectory)/Gain.cpp$(ObjectSuffix) $(IntermediateDirectory)/IOControl.cpp$(ObjectSuffix) $(IntermediateDirectory)/Limiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/Multiplier.cpp$(ObjectSuffix) $(IntermediateDirectory)/RateLimiter.cpp$(ObjectSuffix) $(IntermediateDirectory)/Sum.cpp$(ObjectSuffix) $(IntermediateDirectory)/TransferFunction.cpp$(ObjectSuffix) $(IntermediateDirectory)/Divider.cpp$(ObjectSuffix) $(IntermediateDirectory)/MathOperation.cpp$(ObjectSuffix) \ $(IntermediateDirectory)/GraphicalElement.cpp$(ObjectSuffix) $(IntermediateDirectory)/Text.cpp$(ObjectSuffix) $(IntermediateDirectory)/Branch.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/Capacitor.cpp$(ObjectSuffix) $(IntermediateDirectory)/IndMotor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Inductor.cpp$(ObjectSuffix) $(IntermediateDirectory)/Line.cpp$(ObjectSuffix) $(IntermediateDirectory)/Load.cpp$(ObjectSuffix) $(IntermediateDirectory)/Machines.cpp$(ObjectSuffix) \ @@ -124,14 +124,6 @@ $(IntermediateDirectory)/PropertiesData.cpp$(DependSuffix): PropertiesData.cpp $(IntermediateDirectory)/PropertiesData.cpp$(PreprocessSuffix): PropertiesData.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PropertiesData.cpp$(PreprocessSuffix) PropertiesData.cpp -$(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix): ArtMetro.cpp $(IntermediateDirectory)/ArtMetro.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ArtMetro.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ArtMetro.cpp$(DependSuffix): ArtMetro.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ArtMetro.cpp$(DependSuffix) -MM ArtMetro.cpp - -$(IntermediateDirectory)/ArtMetro.cpp$(PreprocessSuffix): ArtMetro.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ArtMetro.cpp$(PreprocessSuffix) ArtMetro.cpp - $(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix): OpenGLText.cpp $(IntermediateDirectory)/OpenGLText.cpp$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/OpenGLText.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/OpenGLText.cpp$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/OpenGLText.cpp$(DependSuffix): OpenGLText.cpp @@ -140,22 +132,6 @@ $(IntermediateDirectory)/OpenGLText.cpp$(DependSuffix): OpenGLText.cpp $(IntermediateDirectory)/OpenGLText.cpp$(PreprocessSuffix): OpenGLText.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/OpenGLText.cpp$(PreprocessSuffix) OpenGLText.cpp -$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix): MainFrameBitmaps.cpp $(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrameBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix): MainFrameBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MainFrameBitmaps.cpp$(DependSuffix) -MM MainFrameBitmaps.cpp - -$(IntermediateDirectory)/MainFrameBitmaps.cpp$(PreprocessSuffix): MainFrameBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(PreprocessSuffix) MainFrameBitmaps.cpp - -$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix): WorkspaceBitmaps.cpp $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/WorkspaceBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(DependSuffix): WorkspaceBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(DependSuffix) -MM WorkspaceBitmaps.cpp - -$(IntermediateDirectory)/WorkspaceBitmaps.cpp$(PreprocessSuffix): WorkspaceBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(PreprocessSuffix) WorkspaceBitmaps.cpp - $(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix): BusFormBitmaps.cpp $(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/BusFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/BusFormBitmaps.cpp$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix): BusFormBitmaps.cpp @@ -164,101 +140,117 @@ $(IntermediateDirectory)/BusFormBitmaps.cpp$(DependSuffix): BusFormBitmaps.cpp $(IntermediateDirectory)/BusFormBitmaps.cpp$(PreprocessSuffix): BusFormBitmaps.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/BusFormBitmaps.cpp$(PreprocessSuffix) BusFormBitmaps.cpp -$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix): ElementFormBitmaps.cpp $(IntermediateDirectory)/ElementFormBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ElementFormBitmaps.cpp$(DependSuffix): ElementFormBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementFormBitmaps.cpp$(DependSuffix) -MM ElementFormBitmaps.cpp +$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix): base/ChartViewBitmaps.cpp $(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ChartViewBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(DependSuffix): base/ChartViewBitmaps.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(DependSuffix) -MM base/ChartViewBitmaps.cpp -$(IntermediateDirectory)/ElementFormBitmaps.cpp$(PreprocessSuffix): ElementFormBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementFormBitmaps.cpp$(PreprocessSuffix) ElementFormBitmaps.cpp +$(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(PreprocessSuffix): base/ChartViewBitmaps.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ChartViewBitmaps.cpp$(PreprocessSuffix) base/ChartViewBitmaps.cpp -$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix): ControlEditorBitmaps.cpp $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlEditorBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix): ControlEditorBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(DependSuffix) -MM ControlEditorBitmaps.cpp +$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix): base/ControlEditorBitmaps.cpp $(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ControlEditorBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(DependSuffix): base/ControlEditorBitmaps.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(DependSuffix) -MM base/ControlEditorBitmaps.cpp -$(IntermediateDirectory)/ControlEditorBitmaps.cpp$(PreprocessSuffix): ControlEditorBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditorBitmaps.cpp$(PreprocessSuffix) ControlEditorBitmaps.cpp +$(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(PreprocessSuffix): base/ControlEditorBitmaps.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ControlEditorBitmaps.cpp$(PreprocessSuffix) base/ControlEditorBitmaps.cpp -$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix): ChartViewBitmaps.cpp $(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartViewBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix): ChartViewBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartViewBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartViewBitmaps.cpp$(DependSuffix) -MM ChartViewBitmaps.cpp +$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix): base/DataReportBitmaps.cpp $(IntermediateDirectory)/base_DataReportBitmaps.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/DataReportBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(DependSuffix): base/DataReportBitmaps.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(DependSuffix) -MM base/DataReportBitmaps.cpp -$(IntermediateDirectory)/ChartViewBitmaps.cpp$(PreprocessSuffix): ChartViewBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartViewBitmaps.cpp$(PreprocessSuffix) ChartViewBitmaps.cpp +$(IntermediateDirectory)/base_DataReportBitmaps.cpp$(PreprocessSuffix): base/DataReportBitmaps.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_DataReportBitmaps.cpp$(PreprocessSuffix) base/DataReportBitmaps.cpp -$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix): PropertiesFormBitmaps.cpp $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PropertiesFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(DependSuffix): PropertiesFormBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(DependSuffix) -MM PropertiesFormBitmaps.cpp +$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix): base/ElementFormBitmaps.cpp $(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ElementFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(DependSuffix): base/ElementFormBitmaps.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(DependSuffix) -MM base/ElementFormBitmaps.cpp -$(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(PreprocessSuffix): PropertiesFormBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PropertiesFormBitmaps.cpp$(PreprocessSuffix) PropertiesFormBitmaps.cpp +$(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(PreprocessSuffix): base/ElementFormBitmaps.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ElementFormBitmaps.cpp$(PreprocessSuffix) base/ElementFormBitmaps.cpp -$(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix): DataReportBitmaps.cpp $(IntermediateDirectory)/DataReportBitmaps.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/DataReportBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/DataReportBitmaps.cpp$(DependSuffix): DataReportBitmaps.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/DataReportBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/DataReportBitmaps.cpp$(DependSuffix) -MM DataReportBitmaps.cpp +$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix): base/MainFrameBitmaps.cpp $(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/MainFrameBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(DependSuffix): base/MainFrameBitmaps.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(DependSuffix) -MM base/MainFrameBitmaps.cpp -$(IntermediateDirectory)/DataReportBitmaps.cpp$(PreprocessSuffix): DataReportBitmaps.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/DataReportBitmaps.cpp$(PreprocessSuffix) DataReportBitmaps.cpp +$(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(PreprocessSuffix): base/MainFrameBitmaps.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_MainFrameBitmaps.cpp$(PreprocessSuffix) base/MainFrameBitmaps.cpp -$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix): MainFrameBase.cpp $(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/MainFrameBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix): MainFrameBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/MainFrameBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/MainFrameBase.cpp$(DependSuffix) -MM MainFrameBase.cpp +$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix): base/PropertiesFormBitmaps.cpp $(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/PropertiesFormBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(DependSuffix): base/PropertiesFormBitmaps.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(DependSuffix) -MM base/PropertiesFormBitmaps.cpp -$(IntermediateDirectory)/MainFrameBase.cpp$(PreprocessSuffix): MainFrameBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/MainFrameBase.cpp$(PreprocessSuffix) MainFrameBase.cpp +$(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(PreprocessSuffix): base/PropertiesFormBitmaps.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_PropertiesFormBitmaps.cpp$(PreprocessSuffix) base/PropertiesFormBitmaps.cpp -$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix): WorkspaceBase.cpp $(IntermediateDirectory)/WorkspaceBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/WorkspaceBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/WorkspaceBase.cpp$(DependSuffix): WorkspaceBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/WorkspaceBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/WorkspaceBase.cpp$(DependSuffix) -MM WorkspaceBase.cpp +$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix): base/WorkspaceBitmaps.cpp $(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/WorkspaceBitmaps.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(DependSuffix): base/WorkspaceBitmaps.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(DependSuffix) -MM base/WorkspaceBitmaps.cpp -$(IntermediateDirectory)/WorkspaceBase.cpp$(PreprocessSuffix): WorkspaceBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/WorkspaceBase.cpp$(PreprocessSuffix) WorkspaceBase.cpp +$(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(PreprocessSuffix): base/WorkspaceBitmaps.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_WorkspaceBitmaps.cpp$(PreprocessSuffix) base/WorkspaceBitmaps.cpp -$(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix): ElementForm.cpp $(IntermediateDirectory)/ElementForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElementForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ElementForm.cpp$(DependSuffix): ElementForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ElementForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ElementForm.cpp$(DependSuffix) -MM ElementForm.cpp +$(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix): base/ChartViewBase.cpp $(IntermediateDirectory)/base_ChartViewBase.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ChartViewBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_ChartViewBase.cpp$(DependSuffix): base/ChartViewBase.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ChartViewBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ChartViewBase.cpp$(DependSuffix) -MM base/ChartViewBase.cpp -$(IntermediateDirectory)/ElementForm.cpp$(PreprocessSuffix): ElementForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ElementForm.cpp$(PreprocessSuffix) ElementForm.cpp +$(IntermediateDirectory)/base_ChartViewBase.cpp$(PreprocessSuffix): base/ChartViewBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ChartViewBase.cpp$(PreprocessSuffix) base/ChartViewBase.cpp -$(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix): ControlEditorBase.cpp $(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ControlEditorBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix): ControlEditorBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ControlEditorBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ControlEditorBase.cpp$(DependSuffix) -MM ControlEditorBase.cpp +$(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix): base/ControlEditorBase.cpp $(IntermediateDirectory)/base_ControlEditorBase.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ControlEditorBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_ControlEditorBase.cpp$(DependSuffix): base/ControlEditorBase.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ControlEditorBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ControlEditorBase.cpp$(DependSuffix) -MM base/ControlEditorBase.cpp -$(IntermediateDirectory)/ControlEditorBase.cpp$(PreprocessSuffix): ControlEditorBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ControlEditorBase.cpp$(PreprocessSuffix) ControlEditorBase.cpp +$(IntermediateDirectory)/base_ControlEditorBase.cpp$(PreprocessSuffix): base/ControlEditorBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ControlEditorBase.cpp$(PreprocessSuffix) base/ControlEditorBase.cpp -$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix): ChartViewBase.cpp $(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ChartViewBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix): ChartViewBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/ChartViewBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/ChartViewBase.cpp$(DependSuffix) -MM ChartViewBase.cpp +$(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix): base/DataReportBase.cpp $(IntermediateDirectory)/base_DataReportBase.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/DataReportBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_DataReportBase.cpp$(DependSuffix): base/DataReportBase.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_DataReportBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_DataReportBase.cpp$(DependSuffix) -MM base/DataReportBase.cpp -$(IntermediateDirectory)/ChartViewBase.cpp$(PreprocessSuffix): ChartViewBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/ChartViewBase.cpp$(PreprocessSuffix) ChartViewBase.cpp +$(IntermediateDirectory)/base_DataReportBase.cpp$(PreprocessSuffix): base/DataReportBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_DataReportBase.cpp$(PreprocessSuffix) base/DataReportBase.cpp -$(IntermediateDirectory)/PropertiesForm.cpp$(ObjectSuffix): PropertiesForm.cpp $(IntermediateDirectory)/PropertiesForm.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/PropertiesForm.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/PropertiesForm.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/PropertiesForm.cpp$(DependSuffix): PropertiesForm.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/PropertiesForm.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/PropertiesForm.cpp$(DependSuffix) -MM PropertiesForm.cpp +$(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix): base/ElementFormBase.cpp $(IntermediateDirectory)/base_ElementFormBase.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/ElementFormBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_ElementFormBase.cpp$(DependSuffix): base/ElementFormBase.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_ElementFormBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_ElementFormBase.cpp$(DependSuffix) -MM base/ElementFormBase.cpp -$(IntermediateDirectory)/PropertiesForm.cpp$(PreprocessSuffix): PropertiesForm.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/PropertiesForm.cpp$(PreprocessSuffix) PropertiesForm.cpp +$(IntermediateDirectory)/base_ElementFormBase.cpp$(PreprocessSuffix): base/ElementFormBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_ElementFormBase.cpp$(PreprocessSuffix) base/ElementFormBase.cpp -$(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix): DataReportBase.cpp $(IntermediateDirectory)/DataReportBase.cpp$(DependSuffix) - $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/DataReportBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix) $(IncludePath) -$(IntermediateDirectory)/DataReportBase.cpp$(DependSuffix): DataReportBase.cpp - @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/DataReportBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/DataReportBase.cpp$(DependSuffix) -MM DataReportBase.cpp +$(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix): base/MainFrameBase.cpp $(IntermediateDirectory)/base_MainFrameBase.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/MainFrameBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_MainFrameBase.cpp$(DependSuffix): base/MainFrameBase.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_MainFrameBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_MainFrameBase.cpp$(DependSuffix) -MM base/MainFrameBase.cpp -$(IntermediateDirectory)/DataReportBase.cpp$(PreprocessSuffix): DataReportBase.cpp - $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/DataReportBase.cpp$(PreprocessSuffix) DataReportBase.cpp +$(IntermediateDirectory)/base_MainFrameBase.cpp$(PreprocessSuffix): base/MainFrameBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_MainFrameBase.cpp$(PreprocessSuffix) base/MainFrameBase.cpp + +$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix): base/PropertiesFormBase.cpp $(IntermediateDirectory)/base_PropertiesFormBase.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/PropertiesFormBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(DependSuffix): base/PropertiesFormBase.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(DependSuffix) -MM base/PropertiesFormBase.cpp + +$(IntermediateDirectory)/base_PropertiesFormBase.cpp$(PreprocessSuffix): base/PropertiesFormBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_PropertiesFormBase.cpp$(PreprocessSuffix) base/PropertiesFormBase.cpp + +$(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix): base/WorkspaceBase.cpp $(IntermediateDirectory)/base_WorkspaceBase.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/base/WorkspaceBase.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/base_WorkspaceBase.cpp$(DependSuffix): base/WorkspaceBase.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/base_WorkspaceBase.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/base_WorkspaceBase.cpp$(DependSuffix) -MM base/WorkspaceBase.cpp + +$(IntermediateDirectory)/base_WorkspaceBase.cpp$(PreprocessSuffix): base/WorkspaceBase.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/base_WorkspaceBase.cpp$(PreprocessSuffix) base/WorkspaceBase.cpp $(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix): ElectricCalculation.cpp $(IntermediateDirectory)/ElectricCalculation.cpp$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/ElectricCalculation.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/ElectricCalculation.cpp$(ObjectSuffix) $(IncludePath) @@ -324,6 +316,14 @@ $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(DependSuffix): wxMathPlot/math $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(PreprocessSuffix): wxMathPlot/mathplot.cpp $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/wxMathPlot_mathplot.cpp$(PreprocessSuffix) wxMathPlot/mathplot.cpp +$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix): artProvider/ArtMetro.cpp $(IntermediateDirectory)/artProvider_ArtMetro.cpp$(DependSuffix) + $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/artProvider/ArtMetro.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix) $(IncludePath) +$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(DependSuffix): artProvider/ArtMetro.cpp + @$(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) -MG -MP -MT$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(ObjectSuffix) -MF$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(DependSuffix) -MM artProvider/ArtMetro.cpp + +$(IntermediateDirectory)/artProvider_ArtMetro.cpp$(PreprocessSuffix): artProvider/ArtMetro.cpp + $(CXX) $(CXXFLAGS) $(IncludePCH) $(IncludePath) $(PreprocessOnlySwitch) $(OutputSwitch) $(IntermediateDirectory)/artProvider_ArtMetro.cpp$(PreprocessSuffix) artProvider/ArtMetro.cpp + $(IntermediateDirectory)/Camera.cpp$(ObjectSuffix): Camera.cpp $(IntermediateDirectory)/Camera.cpp$(DependSuffix) $(CXX) $(IncludePCH) $(SourceSwitch) "C:/Users/NDSE-69/Documents/GitHub/PSP/Project/Camera.cpp" $(CXXFLAGS) $(ObjectSwitch)$(IntermediateDirectory)/Camera.cpp$(ObjectSuffix) $(IncludePath) $(IntermediateDirectory)/Camera.cpp$(DependSuffix): Camera.cpp diff --git a/Project/Project.project b/Project/Project.project index b32e858..c85466f 100644 --- a/Project/Project.project +++ b/Project/Project.project @@ -2,7 +2,7 @@ <CodeLite_Project Name="Project" InternalType="GUI" Version="10.0.0"> <Plugins> <Plugin Name="qmake"> - <![CDATA[00070001N0005Debug0000000000000001N0016Debug_Ubuntu_x640000000000000001N0017Debug_Windows_x640000000000000001N0007Release0000000000000001N0018Release_Ubuntu_x640000000000000001N0019Release_Windows_x640000000000000001N0014Release_x86_32000000000000]]> + <![CDATA[00090001N0005Debug0000000000000001N0016Debug_Ubuntu_x640000000000000001N0017Debug_Windows_x320000000000000001N0017Debug_Windows_x640000000000000001N0007Release0000000000000001N0018Release_Ubuntu_x640000000000000001N0019Release_Windows_x320000000000000001N0019Release_Windows_x640000000000000001N0014Release_x86_32000000000000]]> </Plugin> <Plugin Name="CppCheck"/> </Plugins> @@ -60,11 +60,13 @@ <File Name="PropertiesData.cpp"/> </VirtualDirectory> <VirtualDirectory Name="view"> - <File Name="ArtMetro.cpp"/> <VirtualDirectory Name="wxMathPlot"> <File Name="wxMathPlot/mathplot.cpp"/> </VirtualDirectory> <File Name="OpenGLText.cpp"/> + <VirtualDirectory Name="artProvider"> + <File Name="artProvider/ArtMetro.cpp"/> + </VirtualDirectory> </VirtualDirectory> <VirtualDirectory Name="controller"> <VirtualDirectory Name="forms"> @@ -173,11 +175,13 @@ <File Name="PropertiesData.h"/> </VirtualDirectory> <VirtualDirectory Name="view"> - <File Name="ArtMetro.h"/> <VirtualDirectory Name="wxMathPlot"> <File Name="wxMathPlot/mathplot.h"/> </VirtualDirectory> <File Name="OpenGLText.h"/> + <VirtualDirectory Name="artProvider"> + <File Name="artProvider/ArtMetro.h"/> + </VirtualDirectory> </VirtualDirectory> <VirtualDirectory Name="controller"> <VirtualDirectory Name="files"> @@ -232,30 +236,30 @@ </VirtualDirectory> <VirtualDirectory Name="wxcrafter"> <VirtualDirectory Name="resources"> - <File Name="MainFrameBitmaps.cpp"/> - <File Name="WorkspaceBitmaps.cpp"/> <File Name="BusFormBitmaps.cpp"/> - <File Name="ElementFormBitmaps.cpp"/> - <File Name="ControlEditorBitmaps.cpp"/> - <File Name="ChartViewBitmaps.cpp"/> - <File Name="PropertiesFormBitmaps.cpp"/> - <File Name="DataReportBitmaps.cpp"/> + <File Name="base/ChartViewBitmaps.cpp"/> + <File Name="base/ControlEditorBitmaps.cpp"/> + <File Name="base/DataReportBitmaps.cpp"/> + <File Name="base/ElementFormBitmaps.cpp"/> + <File Name="base/MainFrameBitmaps.cpp"/> + <File Name="base/PropertiesFormBitmaps.cpp"/> + <File Name="base/WorkspaceBitmaps.cpp"/> </VirtualDirectory> <VirtualDirectory Name="base"> - <File Name="MainFrameBase.h"/> - <File Name="MainFrameBase.cpp"/> - <File Name="WorkspaceBase.h"/> - <File Name="WorkspaceBase.cpp"/> - <File Name="ElementForm.h"/> - <File Name="ElementForm.cpp"/> - <File Name="ControlEditorBase.h"/> - <File Name="ControlEditorBase.cpp"/> - <File Name="ChartViewBase.h"/> - <File Name="ChartViewBase.cpp"/> - <File Name="PropertiesForm.h"/> - <File Name="PropertiesForm.cpp"/> - <File Name="DataReportBase.h"/> - <File Name="DataReportBase.cpp"/> + <File Name="base/ChartViewBase.h"/> + <File Name="base/ChartViewBase.cpp"/> + <File Name="base/ControlEditorBase.h"/> + <File Name="base/ControlEditorBase.cpp"/> + <File Name="base/DataReportBase.h"/> + <File Name="base/DataReportBase.cpp"/> + <File Name="base/ElementFormBase.h"/> + <File Name="base/ElementFormBase.cpp"/> + <File Name="base/MainFrameBase.h"/> + <File Name="base/MainFrameBase.cpp"/> + <File Name="base/PropertiesFormBase.h"/> + <File Name="base/PropertiesFormBase.cpp"/> + <File Name="base/WorkspaceBase.h"/> + <File Name="base/WorkspaceBase.cpp"/> </VirtualDirectory> <File Name="MainFrame.wxcp"/> <File Name="Workspace.wxcp"/> @@ -318,6 +322,46 @@ <SearchPaths/> </Completion> </Configuration> + <Configuration Name="Debug_Windows_x32" CompilerType="MinGW ( TDM-GCC-32 )" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> + <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cflags);-std=gnu++11" C_Options="-g;-O0;-Wall" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0"> + <IncludePath Value="."/> + <Preprocessor Value="UNICODE"/> + </Compiler> + <Linker Options="$(shell wx-config --libs gl);-mwindows" Required="yes"/> + <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/> + <General OutputFile="$(IntermediateDirectory)/pspufu" IntermediateDirectory="./Debug_Windows_x32" Command="./pspufu" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/> + <BuildSystem Name="Default"/> + <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>"> + <![CDATA[]]> + </Environment> + <Debugger IsRemote="no" RemoteHostName="" RemoteHostPort="" DebuggerPath="" IsExtended="no"> + <DebuggerSearchPaths/> + <PostConnectCommands/> + <StartupCommands/> + </Debugger> + <PreBuild/> + <PostBuild/> + <CustomBuild Enabled="no"> + <RebuildCommand/> + <CleanCommand/> + <BuildCommand/> + <PreprocessFileCommand/> + <SingleFileCommand/> + <MakefileGenerationCommand/> + <ThirdPartyToolName>None</ThirdPartyToolName> + <WorkingDirectory/> + </CustomBuild> + <AdditionalRules> + <CustomPostBuild/> + <CustomPreBuild/> + </AdditionalRules> + <Completion EnableCpp11="no" EnableCpp14="no"> + <ClangCmpFlagsC/> + <ClangCmpFlags/> + <ClangPP/> + <SearchPaths/> + </Completion> + </Configuration> <Configuration Name="Debug_Windows_x64" CompilerType="MinGW ( TDM-GCC-64 )" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> <Compiler Options="-g;-O0;-Wall;$(shell wx-config --cflags) " C_Options="-g;-O0;-Wall" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0"> <IncludePath Value="."/> @@ -403,14 +447,14 @@ </Completion> </Configuration> <Configuration Name="Release_Windows_x32" CompilerType="MinGW ( TDM-GCC-32 )" DebuggerType="GNU gdb debugger" Type="Executable" BuildCmpWithGlobalSettings="append" BuildLnkWithGlobalSettings="append" BuildResWithGlobalSettings="append"> - <Compiler Options="-O2;-Wall;$(shell wx-config --cflags);-std=c++11" C_Options="-O2;-Wall" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0"> + <Compiler Options="-O2;-Wall;$(shell wx-config --cflags);-std=gnu++11" C_Options="-O2;-Wall" Assembler="" Required="yes" PreCompiledHeader="" PCHInCommandLine="no" PCHFlags="" PCHFlagsPolicy="0"> <IncludePath Value="."/> <Preprocessor Value="NDEBUG"/> <Preprocessor Value="UNICODE"/> </Compiler> - <Linker Options="$(shell wx-config --libs gl);-mwindows" Required="yes"/> + <Linker Options="$(shell wx-config --libs std,ribbon,aui,propgrid,richtext,gl);-mwindows" Required="yes"/> <ResourceCompiler Options="$(shell wx-config --rcflags)" Required="no"/> - <General OutputFile="$(IntermediateDirectory)/pspufu" IntermediateDirectory="./Release_32" Command="./pspufu" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/> + <General OutputFile="$(IntermediateDirectory)/pspufu" IntermediateDirectory="./Release_Windows_x32" Command="./pspufu" CommandArguments="" UseSeparateDebugArgs="no" DebugArguments="" WorkingDirectory="$(IntermediateDirectory)" PauseExecWhenProcTerminates="no" IsGUIProgram="yes" IsEnabled="yes"/> <BuildSystem Name="Default"/> <Environment EnvVarSetName="<Use Defaults>" DbgSetName="<Use Defaults>"> <![CDATA[]]> diff --git a/Project/Project.txt b/Project/Project.txt index f7bee09..0d5647a 100644 --- a/Project/Project.txt +++ b/Project/Project.txt @@ -1,2 +1,2 @@ -./Release_Windows_x64/main.cpp.o ./Release_Windows_x64/win_resources.rc.o ./Release_Windows_x64/PropertiesData.cpp.o ./Release_Windows_x64/ArtMetro.cpp.o ./Release_Windows_x64/OpenGLText.cpp.o ./Release_Windows_x64/MainFrameBitmaps.cpp.o ./Release_Windows_x64/WorkspaceBitmaps.cpp.o ./Release_Windows_x64/BusFormBitmaps.cpp.o ./Release_Windows_x64/ElementFormBitmaps.cpp.o ./Release_Windows_x64/ControlEditorBitmaps.cpp.o ./Release_Windows_x64/ChartViewBitmaps.cpp.o ./Release_Windows_x64/PropertiesFormBitmaps.cpp.o ./Release_Windows_x64/DataReportBitmaps.cpp.o ./Release_Windows_x64/MainFrameBase.cpp.o ./Release_Windows_x64/WorkspaceBase.cpp.o ./Release_Windows_x64/ElementForm.cpp.o ./Release_Windows_x64/ControlEditorBase.cpp.o ./Release_Windows_x64/ChartViewBase.cpp.o ./Release_Windows_x64/PropertiesForm.cpp.o ./Release_Windows_x64/DataReportBase.cpp.o ./Release_Windows_x64/ElectricCalculation.cpp.o ./Release_Windows_x64/PowerFlow.cpp.o ./Release_Windows_x64/Fault.cpp.o ./Release_Windows_x64/Electromechanical.cpp.o ./Release_Windows_x64/Element.cpp.o ./Release_Windows_x64/ElementDataObject.cpp.o ./Release_Windows_x64/ElementPlotData.cpp.o ./Release_Windows_x64/wxMathPlot_mathplot.cpp.o ./Release_Windows_x64/Camera.cpp.o ./Release_Windows_x64/MainFrame.cpp.o ./Release_Windows_x64/Workspace.cpp.o ./Release_Windows_x64/ChartView.cpp.o ./Release_Windows_x64/ControlEditor.cpp.o ./Release_Windows_x64/DataReport.cpp.o ./Release_Windows_x64/FileHanding.cpp.o ./Release_Windows_x64/ConnectionLine.cpp.o ./Release_Windows_x64/Constant.cpp.o ./Release_Windows_x64/ControlElement.cpp.o ./Release_Windows_x64/ControlElementContainer.cpp.o ./Release_Windows_x64/ControlElementSolver.cpp.o ./Release_Windows_x64/Exponential.cpp.o ./Release_Windows_x64/Gain.cpp.o ./Release_Windows_x64/IOControl.cpp.o ./Release_Windows_x64/Limiter.cpp.o ./Release_Windows_x64/Multiplier.cpp.o ./Release_Windows_x64/RateLimiter.cpp.o ./Release_Windows_x64/Sum.cpp.o ./Release_Windows_x64/TransferFunction.cpp.o ./Release_Windows_x64/Divider.cpp.o ./Release_Windows_x64/MathOperation.cpp.o ./Release_Windows_x64/GraphicalElement.cpp.o ./Release_Windows_x64/Text.cpp.o ./Release_Windows_x64/Branch.cpp.o ./Release_Windows_x64/Bus.cpp.o ./Release_Windows_x64/Capacitor.cpp.o ./Release_Windows_x64/IndMotor.cpp.o ./Release_Windows_x64/Inductor.cpp.o ./Release_Windows_x64/Line.cpp.o ./Release_Windows_x64/Load.cpp.o ./Release_Windows_x64/Machines.cpp.o ./Release_Windows_x64/PowerElement.cpp.o ./Release_Windows_x64/Shunt.cpp.o ./Release_Windows_x64/SyncGenerator.cpp.o ./Release_Windows_x64/SyncMotor.cpp.o +./Release_Windows_x64/main.cpp.o ./Release_Windows_x64/win_resources.rc.o ./Release_Windows_x64/PropertiesData.cpp.o ./Release_Windows_x64/OpenGLText.cpp.o ./Release_Windows_x64/BusFormBitmaps.cpp.o ./Release_Windows_x64/base_ChartViewBitmaps.cpp.o ./Release_Windows_x64/base_ControlEditorBitmaps.cpp.o ./Release_Windows_x64/base_DataReportBitmaps.cpp.o ./Release_Windows_x64/base_ElementFormBitmaps.cpp.o ./Release_Windows_x64/base_MainFrameBitmaps.cpp.o ./Release_Windows_x64/base_PropertiesFormBitmaps.cpp.o ./Release_Windows_x64/base_WorkspaceBitmaps.cpp.o ./Release_Windows_x64/base_ChartViewBase.cpp.o ./Release_Windows_x64/base_ControlEditorBase.cpp.o ./Release_Windows_x64/base_DataReportBase.cpp.o ./Release_Windows_x64/base_ElementFormBase.cpp.o ./Release_Windows_x64/base_MainFrameBase.cpp.o ./Release_Windows_x64/base_PropertiesFormBase.cpp.o ./Release_Windows_x64/base_WorkspaceBase.cpp.o ./Release_Windows_x64/ElectricCalculation.cpp.o ./Release_Windows_x64/PowerFlow.cpp.o ./Release_Windows_x64/Fault.cpp.o ./Release_Windows_x64/Electromechanical.cpp.o ./Release_Windows_x64/Element.cpp.o ./Release_Windows_x64/ElementDataObject.cpp.o ./Release_Windows_x64/ElementPlotData.cpp.o ./Release_Windows_x64/wxMathPlot_mathplot.cpp.o ./Release_Windows_x64/artProvider_ArtMetro.cpp.o ./Release_Windows_x64/Camera.cpp.o ./Release_Windows_x64/MainFrame.cpp.o ./Release_Windows_x64/Workspace.cpp.o ./Release_Windows_x64/ChartView.cpp.o ./Release_Windows_x64/ControlEditor.cpp.o ./Release_Windows_x64/DataReport.cpp.o ./Release_Windows_x64/FileHanding.cpp.o ./Release_Windows_x64/ConnectionLine.cpp.o ./Release_Windows_x64/Constant.cpp.o ./Release_Windows_x64/ControlElement.cpp.o ./Release_Windows_x64/ControlElementContainer.cpp.o ./Release_Windows_x64/ControlElementSolver.cpp.o ./Release_Windows_x64/Exponential.cpp.o ./Release_Windows_x64/Gain.cpp.o ./Release_Windows_x64/IOControl.cpp.o ./Release_Windows_x64/Limiter.cpp.o ./Release_Windows_x64/Multiplier.cpp.o ./Release_Windows_x64/RateLimiter.cpp.o ./Release_Windows_x64/Sum.cpp.o ./Release_Windows_x64/TransferFunction.cpp.o ./Release_Windows_x64/Divider.cpp.o ./Release_Windows_x64/MathOperation.cpp.o ./Release_Windows_x64/GraphicalElement.cpp.o ./Release_Windows_x64/Text.cpp.o ./Release_Windows_x64/Branch.cpp.o ./Release_Windows_x64/Bus.cpp.o ./Release_Windows_x64/Capacitor.cpp.o ./Release_Windows_x64/IndMotor.cpp.o ./Release_Windows_x64/Inductor.cpp.o ./Release_Windows_x64/Line.cpp.o ./Release_Windows_x64/Load.cpp.o ./Release_Windows_x64/Machines.cpp.o ./Release_Windows_x64/PowerElement.cpp.o ./Release_Windows_x64/Shunt.cpp.o ./Release_Windows_x64/SyncGenerator.cpp.o ./Release_Windows_x64/SyncMotor.cpp.o ./Release_Windows_x64/Transformer.cpp.o ./Release_Windows_x64/GeneralPropertiesForm.cpp.o ./Release_Windows_x64/SimulationsSettingsForm.cpp.o ./Release_Windows_x64/AboutForm.cpp.o ./Release_Windows_x64/ConstantForm.cpp.o ./Release_Windows_x64/ControlSystemTest.cpp.o ./Release_Windows_x64/ExponentialForm.cpp.o ./Release_Windows_x64/GainForm.cpp.o ./Release_Windows_x64/IOControlForm.cpp.o ./Release_Windows_x64/LimiterForm.cpp.o ./Release_Windows_x64/RateLimiterForm.cpp.o ./Release_Windows_x64/SumForm.cpp.o ./Release_Windows_x64/TransferFunctionForm.cpp.o ./Release_Windows_x64/TextForm.cpp.o ./Release_Windows_x64/BusForm.cpp.o ./Release_Windows_x64/GeneratorStabForm.cpp.o ./Release_Windows_x64/IndMotorForm.cpp.o ./Release_Windows_x64/LineForm.cpp.o ./Release_Windows_x64/LoadForm.cpp.o ./Release_Windows_x64/ReactiveShuntElementForm.cpp.o ./Release_Windows_x64/SwitchingForm.cpp.o ./Release_Windows_x64/SyncMachineForm.cpp.o ./Release_Windows_x64/TransformerForm.cpp.o diff --git a/Project/PropertiesForm.wxcp b/Project/PropertiesForm.wxcp index 2d0e613..5f2dc93 100644 --- a/Project/PropertiesForm.wxcp +++ b/Project/PropertiesForm.wxcp @@ -1,12 +1,12 @@ { "metadata": { - "m_generatedFilesDir": ".", + "m_generatedFilesDir": "base/", "m_objCounter": 415, "m_includeFiles": [], "m_bitmapFunction": "wxCDAD0InitBitmapResources", "m_bitmapsFile": "PropertiesFormBitmaps.cpp", "m_GenerateCodeTypes": 1, - "m_outputFileName": "PropertiesForm", + "m_outputFileName": "PropertiesFormBase", "m_firstWindowId": 10000, "m_useEnum": true, "m_useUnderscoreMacro": true, diff --git a/Project/RateLimiterForm.h b/Project/RateLimiterForm.h index 6958169..b0ce57a 100644 --- a/Project/RateLimiterForm.h +++ b/Project/RateLimiterForm.h @@ -17,7 +17,7 @@ #ifndef RATELIMITERFORM_H #define RATELIMITERFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class RateLimiter; diff --git a/Project/ReactiveShuntElementForm.h b/Project/ReactiveShuntElementForm.h index 241e092..4972fb3 100644 --- a/Project/ReactiveShuntElementForm.h +++ b/Project/ReactiveShuntElementForm.h @@ -17,7 +17,7 @@ #ifndef REACTIVESHUNTELEMENTFORM_H #define REACTIVESHUNTELEMENTFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" #include <wx/log.h> class Capacitor; diff --git a/Project/SimulationsSettingsForm.h b/Project/SimulationsSettingsForm.h index 635b5ee..c99ab3c 100644 --- a/Project/SimulationsSettingsForm.h +++ b/Project/SimulationsSettingsForm.h @@ -18,7 +18,7 @@ #ifndef SIMULATIONSSETTINGSFORM_H #define SIMULATIONSSETTINGSFORM_H -#include "PropertiesForm.h" +#include "base/PropertiesFormBase.h" class PropertiesData; diff --git a/Project/SumForm.h b/Project/SumForm.h index 9610202..34193d8 100644 --- a/Project/SumForm.h +++ b/Project/SumForm.h @@ -18,7 +18,7 @@ #ifndef SUMFORM_H #define SUMFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class Sum; diff --git a/Project/SwitchingForm.h b/Project/SwitchingForm.h index 973648e..34344af 100644 --- a/Project/SwitchingForm.h +++ b/Project/SwitchingForm.h @@ -18,7 +18,7 @@ #ifndef SWITCHINGFORM_H #define SWITCHINGFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class PowerElement; diff --git a/Project/SyncMachineForm.h b/Project/SyncMachineForm.h index 0a611ad..c56c8c1 100644 --- a/Project/SyncMachineForm.h +++ b/Project/SyncMachineForm.h @@ -18,7 +18,7 @@ #ifndef SYNCMACHINEFORM_H #define SYNCMACHINEFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class GeneratorStabForm; class SyncGenerator; diff --git a/Project/TextForm.h b/Project/TextForm.h index e6d08e8..80e7fe7 100644 --- a/Project/TextForm.h +++ b/Project/TextForm.h @@ -17,7 +17,7 @@ #ifndef TEXTFORM_H #define TEXTFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" #include "Text.h" #include "ElectricCalculation.h" diff --git a/Project/TransferFunctionForm.h b/Project/TransferFunctionForm.h index ebc3b26..fffd362 100644 --- a/Project/TransferFunctionForm.h +++ b/Project/TransferFunctionForm.h @@ -18,7 +18,7 @@ #ifndef TRANSFERFUNCTIONFORM_H #define TRANSFERFUNCTIONFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class TransferFunction; diff --git a/Project/TransformerForm.h b/Project/TransformerForm.h index 82daadc..6b76bf4 100644 --- a/Project/TransformerForm.h +++ b/Project/TransformerForm.h @@ -18,7 +18,7 @@ #ifndef TRANSFORMERFORM_H #define TRANSFORMERFORM_H -#include "ElementForm.h" +#include "base/ElementFormBase.h" class SwitchingForm; class Transformer; diff --git a/Project/Workspace.h b/Project/Workspace.h index 83b64e6..4c9bde6 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -26,7 +26,7 @@ #include <wx/clipbrd.h> #include <wx/tipwin.h> -#include "WorkspaceBase.h" +#include "base/WorkspaceBase.h" #include "Bus.h" #include "ControlEditor.h" diff --git a/Project/Workspace.wxcp b/Project/Workspace.wxcp index 49becd5..f30cd9d 100644 --- a/Project/Workspace.wxcp +++ b/Project/Workspace.wxcp @@ -1,390 +1,390 @@ { - "metadata": { - "m_generatedFilesDir": ".", - "m_objCounter": 6, - "m_includeFiles": [], - "m_bitmapFunction": "wxC52C4InitBitmapResources", - "m_bitmapsFile": "WorkspaceBitmaps.cpp", - "m_GenerateCodeTypes": 1, - "m_outputFileName": "WorkspaceBase", - "m_firstWindowId": 10000, - "m_useEnum": true, - "m_useUnderscoreMacro": true, - "m_addHandlers": true, - "m_templateClasses": [] - }, - "windows": [{ - "m_type": 4407, - "proportion": 0, - "border": 5, - "gbSpan": "1,1", - "gbPosition": "0,0", - "m_styles": ["wxTAB_TRAVERSAL"], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], - "m_properties": [{ - "type": "string", - "m_label": "Size:", - "m_value": "500,300" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "WorkspaceBase" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "<Default>" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "<Default>" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "string", - "m_label": "Title:", - "m_value": "" - }, { - "type": "virtualFolderPicker", - "m_label": "Virtual Folder:", - "m_path": "Project:wxcrafter" - }, { - "type": "choice", - "m_label": "Centre:", - "m_selection": 1, - "m_options": ["", "wxBOTH", "wxVERTICAL", "wxHORIZONTAL"] - }, { - "type": "string", - "m_label": "Inherited Class", - "m_value": "Workspace" - }, { - "type": "string", - "m_label": "File:", - "m_value": "Workspace" - }, { - "type": "string", - "m_label": "Class Decorator", - "m_value": "" - }], - "m_events": [], - "m_children": [{ - "m_type": 4401, - "proportion": 1, - "border": 5, - "gbSpan": "1,1", - "gbPosition": "0,0", - "m_styles": [], - "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], - "m_properties": [{ - "type": "string", - "m_label": "Minimum Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "boxSizer_lvl_1_1" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "choice", - "m_label": "Orientation:", - "m_selection": 0, - "m_options": ["wxVERTICAL", "wxHORIZONTAL"] - }], - "m_events": [], - "m_children": [{ - "m_type": 4505, - "proportion": 1, - "border": 5, - "gbSpan": "1,1", - "gbPosition": "0,0", - "m_styles": [], - "m_sizerFlags": ["wxEXPAND"], - "m_properties": [{ - "type": "winid", - "m_label": "ID:", - "m_winid": "wxID_ANY" - }, { - "type": "string", - "m_label": "Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Minimum Size:", - "m_value": "-1,-1" - }, { - "type": "string", - "m_label": "Name:", - "m_value": "m_glCanvas" - }, { - "type": "multi-string", - "m_label": "Tooltip:", - "m_value": "" - }, { - "type": "colour", - "m_label": "Bg Colour:", - "colour": "<Default>" - }, { - "type": "colour", - "m_label": "Fg Colour:", - "colour": "<Default>" - }, { - "type": "font", - "m_label": "Font:", - "m_value": "" - }, { - "type": "bool", - "m_label": "Hidden", - "m_value": false - }, { - "type": "bool", - "m_label": "Disabled", - "m_value": false - }, { - "type": "bool", - "m_label": "Focused", - "m_value": false - }, { - "type": "string", - "m_label": "Class Name:", - "m_value": "" - }, { - "type": "string", - "m_label": "Include File:", - "m_value": "" - }, { - "type": "string", - "m_label": "Style:", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_RGBA", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_BUFFER_SIZE", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_LEVEL", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_DOUBLEBUFFER", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_STEREO", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_AUX_BUFFERS", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_MIN_RED", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_MIN_GREEN", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_MIN_BLUE", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_MIN_ALPHA", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_DEPTH_SIZE", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_STENCIL_SIZE", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_MIN_ACCUM_RED", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_MIN_ACCUM_GREEN", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_MIN_ACCUM_BLUE", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_MIN_ACCUM_ALPHA", - "m_value": "" - }, { - "type": "string", - "m_label": "WX_GL_SAMPLE_BUFFERS", - "m_value": "1" - }, { - "type": "string", - "m_label": "WX_GL_SAMPLES", - "m_value": "4" - }], - "m_events": [{ - "m_eventName": "wxEVT_PAINT", - "m_eventClass": "wxPaintEvent", - "m_eventHandler": "wxPaintEventHandler", - "m_functionNameAndSignature": "OnPaint(wxPaintEvent& event)", - "m_description": "Process a wxEVT_PAINT event", - "m_noBody": false - }, { - "m_eventName": "wxEVT_LEFT_DOWN", - "m_eventClass": "wxMouseEvent", - "m_eventHandler": "wxMouseEventHandler", - "m_functionNameAndSignature": "OnLeftClickDown(wxMouseEvent& event)", - "m_description": "Process a wxEVT_LEFT_DOWN event. The handler of this event should normally call event.Skip() to allow the default processing to take place as otherwise the window under mouse wouldn't get the focus.", - "m_noBody": false - }, { - "m_eventName": "wxEVT_KEY_DOWN", - "m_eventClass": "wxKeyEvent", - "m_eventHandler": "wxKeyEventHandler", - "m_functionNameAndSignature": "OnKeyDown(wxKeyEvent& event)", - "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", - "m_noBody": false - }, { - "m_eventName": "wxEVT_MOTION", - "m_eventClass": "wxMouseEvent", - "m_eventHandler": "wxMouseEventHandler", - "m_functionNameAndSignature": "OnMouseMotion(wxMouseEvent& event)", - "m_description": "Process a wxEVT_MOTION event", - "m_noBody": false - }, { - "m_eventName": "wxEVT_MIDDLE_DOWN", - "m_eventClass": "wxMouseEvent", - "m_eventHandler": "wxMouseEventHandler", - "m_functionNameAndSignature": "OnMiddleDown(wxMouseEvent& event)", - "m_description": "Process a wxEVT_MIDDLE_DOWN event", - "m_noBody": false - }, { - "m_eventName": "wxEVT_MIDDLE_UP", - "m_eventClass": "wxMouseEvent", - "m_eventHandler": "wxMouseEventHandler", - "m_functionNameAndSignature": "OnMiddleUp(wxMouseEvent& event)", - "m_description": "Process a wxEVT_MIDDLE_UP event", - "m_noBody": false - }, { - "m_eventName": "wxEVT_LEFT_UP", - "m_eventClass": "wxMouseEvent", - "m_eventHandler": "wxMouseEventHandler", - "m_functionNameAndSignature": "OnLeftClickUp(wxMouseEvent& event)", - "m_description": "Process a wxEVT_LEFT_UP event.", - "m_noBody": false - }, { - "m_eventName": "wxEVT_MOUSEWHEEL", - "m_eventClass": "wxMouseEvent", - "m_eventHandler": "wxMouseEventHandler", - "m_functionNameAndSignature": "OnScroll(wxMouseEvent& event)", - "m_description": "Process a wxEVT_MOUSEWHEEL event", - "m_noBody": false - }, { - "m_eventName": "wxEVT_RIGHT_DOWN", - "m_eventClass": "wxMouseEvent", - "m_eventHandler": "wxMouseEventHandler", - "m_functionNameAndSignature": "OnRightClickDown(wxMouseEvent& event)", - "m_description": "Process a wxEVT_RIGHT_DOWN event", - "m_noBody": false - }, { - "m_eventName": "wxEVT_LEFT_DCLICK", - "m_eventClass": "wxMouseEvent", - "m_eventHandler": "wxMouseEventHandler", - "m_functionNameAndSignature": "OnLeftDoubleClick(wxMouseEvent& event)", - "m_description": "Process a wxEVT_LEFT_DCLICK event.", - "m_noBody": false - }, { - "m_eventName": "wxEVT_IDLE", - "m_eventClass": "wxIdleEvent", - "m_eventHandler": "wxIdleEventHandler", - "m_functionNameAndSignature": "OnIdle(wxIdleEvent& event)", - "m_description": "Process a wxEVT_IDLE event", - "m_noBody": false - }, { - "m_eventName": "wxEVT_MIDDLE_DCLICK", - "m_eventClass": "wxMouseEvent", - "m_eventHandler": "wxMouseEventHandler", - "m_functionNameAndSignature": "OnMiddleDoubleClick(wxMouseEvent& event)", - "m_description": "Process a wxEVT_MIDDLE_DCLICK event.", - "m_noBody": false - }], - "m_children": [] - }] - }, { - "m_type": 4483, - "proportion": 0, - "border": 5, - "gbSpan": "1,1", - "gbPosition": "0,0", - "m_styles": [], - "m_sizerFlags": [], - "m_properties": [{ - "type": "string", - "m_label": "Name:", - "m_value": "m_timer" - }, { - "type": "integer", - "m_label": "Interval", - "m_value": 1500 - }, { - "type": "bool", - "m_label": "Start the timer", - "m_value": true - }, { - "type": "bool", - "m_label": "One Shot Timer", - "m_value": false - }], - "m_events": [{ - "m_eventName": "wxEVT_TIMER", - "m_eventClass": "wxTimerEvent", - "m_eventHandler": "wxTimerEventHandler", - "m_functionNameAndSignature": "OnTimer(wxTimerEvent& event)", - "m_description": "Process a timer event", - "m_noBody": false - }], - "m_children": [] - }] - }] + "metadata": { + "m_generatedFilesDir": "base/", + "m_objCounter": 6, + "m_includeFiles": [], + "m_bitmapFunction": "wxC52C4InitBitmapResources", + "m_bitmapsFile": "WorkspaceBitmaps.cpp", + "m_GenerateCodeTypes": 1, + "m_outputFileName": "WorkspaceBase", + "m_firstWindowId": 10000, + "m_useEnum": true, + "m_useUnderscoreMacro": true, + "m_addHandlers": true, + "m_templateClasses": [] + }, + "windows": [{ + "m_type": 4407, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": ["wxTAB_TRAVERSAL"], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM"], + "m_properties": [{ + "type": "string", + "m_label": "Size:", + "m_value": "500,300" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "WorkspaceBase" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "<Default>" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "<Default>" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "Title:", + "m_value": "" + }, { + "type": "virtualFolderPicker", + "m_label": "Virtual Folder:", + "m_path": "Project:wxcrafter" + }, { + "type": "choice", + "m_label": "Centre:", + "m_selection": 1, + "m_options": ["", "wxBOTH", "wxVERTICAL", "wxHORIZONTAL"] + }, { + "type": "string", + "m_label": "Inherited Class", + "m_value": "Workspace" + }, { + "type": "string", + "m_label": "File:", + "m_value": "Workspace" + }, { + "type": "string", + "m_label": "Class Decorator", + "m_value": "" + }], + "m_events": [], + "m_children": [{ + "m_type": 4401, + "proportion": 1, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxALL", "wxLEFT", "wxRIGHT", "wxTOP", "wxBOTTOM", "wxEXPAND"], + "m_properties": [{ + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "boxSizer_lvl_1_1" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "choice", + "m_label": "Orientation:", + "m_selection": 0, + "m_options": ["wxVERTICAL", "wxHORIZONTAL"] + }], + "m_events": [], + "m_children": [{ + "m_type": 4505, + "proportion": 1, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": ["wxEXPAND"], + "m_properties": [{ + "type": "winid", + "m_label": "ID:", + "m_winid": "wxID_ANY" + }, { + "type": "string", + "m_label": "Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Minimum Size:", + "m_value": "-1,-1" + }, { + "type": "string", + "m_label": "Name:", + "m_value": "m_glCanvas" + }, { + "type": "multi-string", + "m_label": "Tooltip:", + "m_value": "" + }, { + "type": "colour", + "m_label": "Bg Colour:", + "colour": "<Default>" + }, { + "type": "colour", + "m_label": "Fg Colour:", + "colour": "<Default>" + }, { + "type": "font", + "m_label": "Font:", + "m_value": "" + }, { + "type": "bool", + "m_label": "Hidden", + "m_value": false + }, { + "type": "bool", + "m_label": "Disabled", + "m_value": false + }, { + "type": "bool", + "m_label": "Focused", + "m_value": false + }, { + "type": "string", + "m_label": "Class Name:", + "m_value": "" + }, { + "type": "string", + "m_label": "Include File:", + "m_value": "" + }, { + "type": "string", + "m_label": "Style:", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_RGBA", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_BUFFER_SIZE", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_LEVEL", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_DOUBLEBUFFER", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_STEREO", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_AUX_BUFFERS", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_MIN_RED", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_MIN_GREEN", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_MIN_BLUE", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_MIN_ALPHA", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_DEPTH_SIZE", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_STENCIL_SIZE", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_MIN_ACCUM_RED", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_MIN_ACCUM_GREEN", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_MIN_ACCUM_BLUE", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_MIN_ACCUM_ALPHA", + "m_value": "" + }, { + "type": "string", + "m_label": "WX_GL_SAMPLE_BUFFERS", + "m_value": "1" + }, { + "type": "string", + "m_label": "WX_GL_SAMPLES", + "m_value": "4" + }], + "m_events": [{ + "m_eventName": "wxEVT_PAINT", + "m_eventClass": "wxPaintEvent", + "m_eventHandler": "wxPaintEventHandler", + "m_functionNameAndSignature": "OnPaint(wxPaintEvent& event)", + "m_description": "Process a wxEVT_PAINT event", + "m_noBody": false + }, { + "m_eventName": "wxEVT_LEFT_DOWN", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnLeftClickDown(wxMouseEvent& event)", + "m_description": "Process a wxEVT_LEFT_DOWN event. The handler of this event should normally call event.Skip() to allow the default processing to take place as otherwise the window under mouse wouldn't get the focus.", + "m_noBody": false + }, { + "m_eventName": "wxEVT_KEY_DOWN", + "m_eventClass": "wxKeyEvent", + "m_eventHandler": "wxKeyEventHandler", + "m_functionNameAndSignature": "OnKeyDown(wxKeyEvent& event)", + "m_description": "Process a wxEVT_KEY_DOWN event (any key has been pressed)", + "m_noBody": false + }, { + "m_eventName": "wxEVT_MOTION", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnMouseMotion(wxMouseEvent& event)", + "m_description": "Process a wxEVT_MOTION event", + "m_noBody": false + }, { + "m_eventName": "wxEVT_MIDDLE_DOWN", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnMiddleDown(wxMouseEvent& event)", + "m_description": "Process a wxEVT_MIDDLE_DOWN event", + "m_noBody": false + }, { + "m_eventName": "wxEVT_MIDDLE_UP", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnMiddleUp(wxMouseEvent& event)", + "m_description": "Process a wxEVT_MIDDLE_UP event", + "m_noBody": false + }, { + "m_eventName": "wxEVT_LEFT_UP", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnLeftClickUp(wxMouseEvent& event)", + "m_description": "Process a wxEVT_LEFT_UP event.", + "m_noBody": false + }, { + "m_eventName": "wxEVT_MOUSEWHEEL", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnScroll(wxMouseEvent& event)", + "m_description": "Process a wxEVT_MOUSEWHEEL event", + "m_noBody": false + }, { + "m_eventName": "wxEVT_RIGHT_DOWN", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnRightClickDown(wxMouseEvent& event)", + "m_description": "Process a wxEVT_RIGHT_DOWN event", + "m_noBody": false + }, { + "m_eventName": "wxEVT_LEFT_DCLICK", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnLeftDoubleClick(wxMouseEvent& event)", + "m_description": "Process a wxEVT_LEFT_DCLICK event.", + "m_noBody": false + }, { + "m_eventName": "wxEVT_IDLE", + "m_eventClass": "wxIdleEvent", + "m_eventHandler": "wxIdleEventHandler", + "m_functionNameAndSignature": "OnIdle(wxIdleEvent& event)", + "m_description": "Process a wxEVT_IDLE event", + "m_noBody": false + }, { + "m_eventName": "wxEVT_MIDDLE_DCLICK", + "m_eventClass": "wxMouseEvent", + "m_eventHandler": "wxMouseEventHandler", + "m_functionNameAndSignature": "OnMiddleDoubleClick(wxMouseEvent& event)", + "m_description": "Process a wxEVT_MIDDLE_DCLICK event.", + "m_noBody": false + }], + "m_children": [] + }] + }, { + "m_type": 4483, + "proportion": 0, + "border": 5, + "gbSpan": "1,1", + "gbPosition": "0,0", + "m_styles": [], + "m_sizerFlags": [], + "m_properties": [{ + "type": "string", + "m_label": "Name:", + "m_value": "m_timer" + }, { + "type": "integer", + "m_label": "Interval", + "m_value": 1500 + }, { + "type": "bool", + "m_label": "Start the timer", + "m_value": true + }, { + "type": "bool", + "m_label": "One Shot Timer", + "m_value": false + }], + "m_events": [{ + "m_eventName": "wxEVT_TIMER", + "m_eventClass": "wxTimerEvent", + "m_eventHandler": "wxTimerEventHandler", + "m_functionNameAndSignature": "OnTimer(wxTimerEvent& event)", + "m_description": "Process a timer event", + "m_noBody": false + }], + "m_children": [] + }] + }] }
\ No newline at end of file diff --git a/Project/ArtMetro.cpp b/Project/artProvider/ArtMetro.cpp index dd15b88..dd15b88 100644 --- a/Project/ArtMetro.cpp +++ b/Project/artProvider/ArtMetro.cpp diff --git a/Project/ArtMetro.h b/Project/artProvider/ArtMetro.h index f805954..f805954 100644 --- a/Project/ArtMetro.h +++ b/Project/artProvider/ArtMetro.h diff --git a/Project/ChartViewBase.cpp b/Project/base/ChartViewBase.cpp index 42e9beb..42e9beb 100644 --- a/Project/ChartViewBase.cpp +++ b/Project/base/ChartViewBase.cpp diff --git a/Project/ChartViewBase.h b/Project/base/ChartViewBase.h index 5801081..5801081 100644 --- a/Project/ChartViewBase.h +++ b/Project/base/ChartViewBase.h diff --git a/Project/ChartViewBitmaps.cpp b/Project/base/ChartViewBitmaps.cpp index ef6907a..ef6907a 100644 --- a/Project/ChartViewBitmaps.cpp +++ b/Project/base/ChartViewBitmaps.cpp diff --git a/Project/ControlEditorBase.cpp b/Project/base/ControlEditorBase.cpp index cf391b7..cf391b7 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/base/ControlEditorBase.cpp diff --git a/Project/ControlEditorBase.h b/Project/base/ControlEditorBase.h index 6580e73..6580e73 100644 --- a/Project/ControlEditorBase.h +++ b/Project/base/ControlEditorBase.h diff --git a/Project/ControlEditorBitmaps.cpp b/Project/base/ControlEditorBitmaps.cpp index b7212e1..b7212e1 100644 --- a/Project/ControlEditorBitmaps.cpp +++ b/Project/base/ControlEditorBitmaps.cpp diff --git a/Project/DataReportBase.cpp b/Project/base/DataReportBase.cpp index 0e14d38..0e14d38 100644 --- a/Project/DataReportBase.cpp +++ b/Project/base/DataReportBase.cpp diff --git a/Project/DataReportBase.h b/Project/base/DataReportBase.h index 3e6784c..3e6784c 100644 --- a/Project/DataReportBase.h +++ b/Project/base/DataReportBase.h diff --git a/Project/DataReportBitmaps.cpp b/Project/base/DataReportBitmaps.cpp index 5d547ad..5d547ad 100644 --- a/Project/DataReportBitmaps.cpp +++ b/Project/base/DataReportBitmaps.cpp diff --git a/Project/ElementForm.cpp b/Project/base/ElementFormBase.cpp index a42b852..e1e953e 100644 --- a/Project/ElementForm.cpp +++ b/Project/base/ElementFormBase.cpp @@ -4,7 +4,7 @@ // Do not modify this file by hand! ////////////////////////////////////////////////////////////////////// -#include "ElementForm.h" +#include "ElementFormBase.h" // Declare the bitmap loading function diff --git a/Project/ElementForm.h b/Project/base/ElementFormBase.h index fc07150..fc07150 100644 --- a/Project/ElementForm.h +++ b/Project/base/ElementFormBase.h diff --git a/Project/ElementFormBitmaps.cpp b/Project/base/ElementFormBitmaps.cpp index b955c05..b955c05 100644 --- a/Project/ElementFormBitmaps.cpp +++ b/Project/base/ElementFormBitmaps.cpp diff --git a/Project/MainFrameBase.cpp b/Project/base/MainFrameBase.cpp index bcac269..bcac269 100644 --- a/Project/MainFrameBase.cpp +++ b/Project/base/MainFrameBase.cpp diff --git a/Project/MainFrameBase.h b/Project/base/MainFrameBase.h index 10859e8..1886036 100644 --- a/Project/MainFrameBase.h +++ b/Project/base/MainFrameBase.h @@ -42,38 +42,38 @@ class MainFrameBase : public wxFrame { public: enum { - ID_RIBBON_ABOUT = 10001, - ID_RIBBON_ADDELEMENT = 10002, - ID_RIBBON_CHARTS = 10003, - ID_RIBBON_CLOSE = 10004, - ID_RIBBON_COPY = 10005, - ID_RIBBON_DATAREPORT = 10006, - ID_RIBBON_DELETE = 10007, - ID_RIBBON_DISABLESOL = 10008, - ID_RIBBON_DRAG = 10009, - ID_RIBBON_ENABLESOL = 10010, - ID_RIBBON_EXIT = 10011, - ID_RIBBON_FAULT = 10012, - ID_RIBBON_FIT = 10013, - ID_RIBBON_GENSETTINGS = 10014, - ID_RIBBON_GUIDE = 10015, - ID_RIBBON_MOVE = 10016, - ID_RIBBON_NEW = 10017, - ID_RIBBON_OPEN = 10018, - ID_RIBBON_PASTE = 10019, - ID_RIBBON_POWERFLOW = 10020, - ID_RIBBON_PROJSETTINGS = 10021, + ID_RIBBON_SCPOWER = 10001, + ID_RIBBON_FAULT = 10002, + ID_RIBBON_RUNSTAB = 10003, + ID_RIBBON_POWERFLOW = 10004, + ID_RIBBON_RESETVOLT = 10005, + ID_RIBBON_DISABLESOL = 10006, + ID_RIBBON_ENABLESOL = 10007, + ID_RIBBON_CHARTS = 10008, + ID_RIBBON_COPY = 10009, + ID_RIBBON_ABOUT = 10010, + ID_RIBBON_SNAPSHOT = 10011, + ID_RIBBON_PASTE = 10012, + ID_RIBBON_ADDELEMENT = 10013, + ID_RIBBON_GUIDE = 10014, + ID_RIBBON_CLOSE = 10015, + ID_RIBBON_SAVEAS = 10016, + ID_RIBBON_OPEN = 10017, + ID_RIBBON_GENSETTINGS = 10018, + ID_RIBBON_FIT = 10019, + ID_RIBBON_SIMULSETTINGS = 10020, + ID_RIBBON_UNDO = 10021, ID_RIBBON_REDO = 10022, - ID_RIBBON_RESETVOLT = 10023, - ID_RIBBON_ROTATEC = 10024, - ID_RIBBON_ROTATECC = 10025, - ID_RIBBON_RUNSTAB = 10026, - ID_RIBBON_SAVE = 10027, - ID_RIBBON_SAVEAS = 10028, - ID_RIBBON_SCPOWER = 10029, - ID_RIBBON_SIMULSETTINGS = 10030, - ID_RIBBON_SNAPSHOT = 10031, - ID_RIBBON_UNDO = 10032, + ID_RIBBON_ROTATECC = 10023, + ID_RIBBON_EXIT = 10024, + ID_RIBBON_DRAG = 10025, + ID_RIBBON_SAVE = 10026, + ID_RIBBON_NEW = 10027, + ID_RIBBON_MOVE = 10028, + ID_RIBBON_PROJSETTINGS = 10029, + ID_RIBBON_DELETE = 10030, + ID_RIBBON_ROTATEC = 10031, + ID_RIBBON_DATAREPORT = 10032, }; protected: wxRibbonBar* m_ribbonBar; diff --git a/Project/MainFrameBitmaps.cpp b/Project/base/MainFrameBitmaps.cpp index 42f52fd..42f52fd 100644 --- a/Project/MainFrameBitmaps.cpp +++ b/Project/base/MainFrameBitmaps.cpp diff --git a/Project/PropertiesForm.cpp b/Project/base/PropertiesFormBase.cpp index 97bb9c0..b451f01 100644 --- a/Project/PropertiesForm.cpp +++ b/Project/base/PropertiesFormBase.cpp @@ -4,7 +4,7 @@ // Do not modify this file by hand! ////////////////////////////////////////////////////////////////////// -#include "PropertiesForm.h" +#include "PropertiesFormBase.h" // Declare the bitmap loading function diff --git a/Project/PropertiesForm.h b/Project/base/PropertiesFormBase.h index 887f14b..887f14b 100644 --- a/Project/PropertiesForm.h +++ b/Project/base/PropertiesFormBase.h diff --git a/Project/PropertiesFormBitmaps.cpp b/Project/base/PropertiesFormBitmaps.cpp index afcda14..9a7a6c3 100644 --- a/Project/PropertiesFormBitmaps.cpp +++ b/Project/base/PropertiesFormBitmaps.cpp @@ -2654,6 +2654,6 @@ void wxCDAD0InitBitmapResources() } XRC_ADD_FILE(wxT("XRC_resource/PropertiesFormBitmaps.cpp$data_images_About2017.png"), xml_res_file_0, xml_res_size_0, wxT("image/png")); - XRC_ADD_FILE(wxT("XRC_resource/PropertiesFormBitmaps.cpp$_home_thales_Documentos_GitHub_PSP_Project_PropertiesFormBitmaps.xrc"), xml_res_file_1, xml_res_size_1, wxT("text/xml")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/PropertiesFormBitmaps.cpp$_home_thales_Documentos_GitHub_PSP_Project_PropertiesFormBitmaps.xrc")); + XRC_ADD_FILE(wxT("XRC_resource/PropertiesFormBitmaps.cpp$C__Users_NDSE-69_Documents_GitHub_PSP_Project_PropertiesFormBitmaps.xrc"), xml_res_file_1, xml_res_size_1, wxT("text/xml")); + wxXmlResource::Get()->Load(wxT("memory:XRC_resource/PropertiesFormBitmaps.cpp$C__Users_NDSE-69_Documents_GitHub_PSP_Project_PropertiesFormBitmaps.xrc")); } diff --git a/Project/WorkspaceBase.cpp b/Project/base/WorkspaceBase.cpp index 6fc2b79..6fc2b79 100644 --- a/Project/WorkspaceBase.cpp +++ b/Project/base/WorkspaceBase.cpp diff --git a/Project/WorkspaceBase.h b/Project/base/WorkspaceBase.h index 2ceed20..2ceed20 100644 --- a/Project/WorkspaceBase.h +++ b/Project/base/WorkspaceBase.h diff --git a/Project/WorkspaceBitmaps.cpp b/Project/base/WorkspaceBitmaps.cpp index 58fd068..b370872 100644 --- a/Project/WorkspaceBitmaps.cpp +++ b/Project/base/WorkspaceBitmaps.cpp @@ -44,6 +44,6 @@ void wxC52C4InitBitmapResources() else wxFileSystem::AddHandler(new wxMemoryFSHandlerBase); } - XRC_ADD_FILE(wxT("XRC_resource/WorkspaceBitmaps.cpp$_home_thales_Documentos_GitHub_PSP_Project_WorkspaceBitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml")); - wxXmlResource::Get()->Load(wxT("memory:XRC_resource/WorkspaceBitmaps.cpp$_home_thales_Documentos_GitHub_PSP_Project_WorkspaceBitmaps.xrc")); + XRC_ADD_FILE(wxT("XRC_resource/WorkspaceBitmaps.cpp$C__Users_NDSE-69_Documents_GitHub_PSP_Project_WorkspaceBitmaps.xrc"), xml_res_file_0, xml_res_size_0, wxT("text/xml")); + wxXmlResource::Get()->Load(wxT("memory:XRC_resource/WorkspaceBitmaps.cpp$C__Users_NDSE-69_Documents_GitHub_PSP_Project_WorkspaceBitmaps.xrc")); } |