Chart Director implemented

The user can select between wxMathPlot and ChartDirector plot libs
Thales1330 · Jun 19, 2024 · c174762 · c174762
1 parent 96e0abd
commit c174762
Show file tree

Hide file tree

Showing 67 changed files with 15,467 additions and 4,806 deletions.
diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp
@@ -674,6 +674,9 @@ void MainFrame::OnGeneralSettingsClick(wxRibbonButtonBarEvent& event)
 	GeneralPropertiesForm genPropForm(this, m_generalProperties);
 	genPropForm.SetInitialSize();
 	genPropForm.ShowModal();
+	for(auto& workspace : m_workspaceList) {
+		workspace->GetProperties()->SetGeneralPropertiesData(m_generalProperties->GetGeneralPropertiesData());
+	}
 }
 
 void MainFrame::OnSimulationSettingsClick(wxRibbonButtonBarEvent& event)

diff --git a/Project/PSP-UFU.vcxproj b/Project/PSP-UFU.vcxproj
@@ -109,8 +109,8 @@
     <Link>
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;advapi32.lib;version.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;wininet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(wxOutDirName);$(SolutionDir)\vendors\chatdir\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>chartdir70.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;advapi32.lib;version.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;wininet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <ManifestResourceCompile />
     <Manifest>
@@ -156,8 +156,8 @@
       <OptimizeReferences>true</OptimizeReferences>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ImageHasSafeExceptionHandlers>true</ImageHasSafeExceptionHandlers>
-      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(wxOutDirName);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;advapi32.lib;version.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;wininet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(MSBuildThisFileDirectory)lib\$(wxOutDirName);$(SolutionDir)\vendors\chatdir\win32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>chartdir70.lib;kernel32.lib;user32.lib;gdi32.lib;comdlg32.lib;winspool.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;advapi32.lib;version.lib;comctl32.lib;rpcrt4.lib;wsock32.lib;wininet.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
     <Manifest>
       <AdditionalManifestFiles>win_resources.rc</AdditionalManifestFiles>
@@ -190,6 +190,7 @@
     </Manifest>
   </ItemDefinitionGroup>
   <ItemGroup>
+    <ClCompile Include="extLibs\wxChartDir\wxchartviewer.cpp" />
     <ClCompile Include="forms\AboutForm.cpp" />
     <ClCompile Include="elements\powerElement\Branch.cpp" />
     <ClCompile Include="elements\powerElement\Bus.cpp" />
@@ -296,6 +297,12 @@
     <ClCompile Include="utils\XMLParser.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="extLibs\wxChartDir\bchartdir.h" />
+    <ClInclude Include="extLibs\wxChartDir\chartdir.h" />
+    <ClInclude Include="extLibs\wxChartDir\memblock.h" />
+    <ClInclude Include="extLibs\wxChartDir\wxchartviewer.h" />
+    <ClInclude Include="extLibs\wxChartDir\wxchartviewer_defs.h" />
+    <ClInclude Include="extLibs\wxChartDir\wxchartviewer_version.h" />
     <ClInclude Include="forms\AboutForm.h" />
     <ClInclude Include="elements\powerElement\Branch.h" />
     <ClInclude Include="elements\powerElement\Bus.h" />

diff --git a/Project/compile_flags.txt b/Project/compile_flags.txt
@@ -1,24 +1,7 @@
 -IC:\Users\Pichau\Documents\GitHub\PSP\Project
 -IC:\Users\Pichau\Documents\GitHub\PSP\ExtLibs\GLEW\include
 -IC:\Users\Pichau\Documents\GitHub\PSP\ExtLibs\GLFW\include
--IC:\wxWidgets-3.1.5-precomp\lib\gcc920TDM_dll\mswu
--IC:\wxWidgets-3.1.5-precomp\include
--IC:\TDM-GCC-64\lib\gcc\x86_64-w64-mingw32\10.3.0\include\c++
--IC:\TDM-GCC-64\lib\gcc\x86_64-w64-mingw32\10.3.0\include\c++\x86_64-w64-mingw32
--IC:\TDM-GCC-64\lib\gcc\x86_64-w64-mingw32\10.3.0\include\c++\backward
--IC:\TDM-GCC-64\lib\gcc\x86_64-w64-mingw32\10.3.0\include
--IC:\TDM-GCC-64\include
--IC:\TDM-GCC-64\lib\gcc\x86_64-w64-mingw32\10.3.0\include-fixed
--IC:\TDM-GCC-64\x86_64-w64-mingw32\include
--DwxDEBUG_LEVEL=0
--D_UNICODE
--DHAVE_W32API_H
--DWXUSINGDLL
--D_FILE_OFFSET_BITS=64
 -DUNICODE
 -DNDEBUG
--D__WXMSW__
 -DGLEW_STATIC
 -std=gnu++17
--target
-x86_64-w64-mingw32