diff options
| -rw-r--r-- | .codelite/.tern-port | 2 | ||||
| -rw-r--r-- | .codelite/.tern-project | 2 | ||||
| -rw-r--r-- | .codelite/PSP.session | 42 | ||||
| -rw-r--r-- | .codelite/PSP.tags | bin | 80360448 -> 80373760 bytes | |||
| -rw-r--r-- | .codelite/compilation.db | bin | 21504 -> 21504 bytes | |||
| -rw-r--r-- | .codelite/compile_commands.json | 8 | ||||
| -rw-r--r-- | .codelite/refactoring.db | bin | 323584 -> 344064 bytes | |||
| -rw-r--r-- | Project/MainFrame.cpp | 4 | ||||
| -rw-r--r-- | Project/MainFrame.h | 6 | ||||
| -rw-r--r-- | Project/MouseEventsHandler.cpp | 9 | ||||
| -rw-r--r-- | Project/MouseEventsHandler.h | 2 | ||||
| -rw-r--r-- | Project/Project.mk | 7 | ||||
| -rw-r--r-- | Project/Project.txt | 2 | ||||
| -rw-r--r-- | Project/Release/MainFrame.cpp.o | bin | 0 -> 118857 bytes | |||
| -rw-r--r-- | Project/Release/MainFrame.cpp.o.d | 6 | ||||
| -rw-r--r-- | Project/Release/MouseEventsHandler.cpp.o | bin | 0 -> 63518 bytes | |||
| -rw-r--r-- | Project/Release/PSP-UFU.exe | bin | 3223140 -> 3228851 bytes | |||
| -rw-r--r-- | Project/Release/Workspace.cpp.o | bin | 63701 -> 65439 bytes | |||
| -rw-r--r-- | Project/Release/Workspace.cpp.o.d | 8 | ||||
| -rw-r--r-- | Project/Workspace.cpp | 59 | ||||
| -rw-r--r-- | Project/Workspace.h | 18 |
21 files changed, 105 insertions, 70 deletions
diff --git a/.codelite/.tern-port b/.codelite/.tern-port index 5a5f714..947fa2e 100644 --- a/.codelite/.tern-port +++ b/.codelite/.tern-port @@ -1 +1 @@ -51837
\ No newline at end of file +62773
\ No newline at end of file diff --git a/.codelite/.tern-project b/.codelite/.tern-project index 09b6465..d5969c6 100644 --- a/.codelite/.tern-project +++ b/.codelite/.tern-project @@ -8,6 +8,8 @@ "node_resolve": { }, "node": { + }, + "complete_strings": { } } }
\ No newline at end of file diff --git a/.codelite/PSP.session b/.codelite/PSP.session index f5dff97..253020a 100644 --- a/.codelite/PSP.session +++ b/.codelite/PSP.session @@ -5,36 +5,64 @@ <TabInfoArray Name="TabInfoArray"> <TabInfo> <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\MainFrame.cpp" Name="FileName"/> - <int Value="84" Name="FirstVisibleLine"/> - <int Value="104" Name="CurrentLine"/> + <int Value="91" Name="FirstVisibleLine"/> + <int Value="106" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\MainFrame.h" Name="FileName"/> + <int Value="0" Name="FirstVisibleLine"/> + <int Value="6" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> <TabInfo> <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Workspace.cpp" Name="FileName"/> <int Value="0" Name="FirstVisibleLine"/> - <int Value="1" Name="CurrentLine"/> + <int Value="22" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> <TabInfo> <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Workspace.h" Name="FileName"/> - <int Value="15" Name="FirstVisibleLine"/> - <int Value="46" Name="CurrentLine"/> + <int Value="12" Name="FirstVisibleLine"/> + <int Value="38" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> <TabInfo> <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\MouseEventsHandler.h" Name="FileName"/> <int Value="0" Name="FirstVisibleLine"/> - <int Value="3" Name="CurrentLine"/> + <int Value="13" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> <TabInfo> <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\MouseEventsHandler.cpp" Name="FileName"/> <int Value="0" Name="FirstVisibleLine"/> - <int Value="17" Name="CurrentLine"/> + <int Value="14" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Element.h" Name="FileName"/> + <int Value="0" Name="FirstVisibleLine"/> + <int Value="5" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Bus.h" Name="FileName"/> + <int Value="0" Name="FirstVisibleLine"/> + <int Value="3" Name="CurrentLine"/> + <wxArrayString Name="Bookmarks"/> + <IntVector Name="CollapsedFolds"/> + </TabInfo> + <TabInfo> + <wxString Value="C:\Users\Thales\Documents\GitHub\PSP\Project\Bus.cpp" Name="FileName"/> + <int Value="0" Name="FirstVisibleLine"/> + <int Value="0" Name="CurrentLine"/> <wxArrayString Name="Bookmarks"/> <IntVector Name="CollapsedFolds"/> </TabInfo> diff --git a/.codelite/PSP.tags b/.codelite/PSP.tags Binary files differindex c92cf6e..2f2129c 100644 --- a/.codelite/PSP.tags +++ b/.codelite/PSP.tags diff --git a/.codelite/compilation.db b/.codelite/compilation.db Binary files differindex 35f5647..7ab17c4 100644 --- a/.codelite/compilation.db +++ b/.codelite/compilation.db diff --git a/.codelite/compile_commands.json b/.codelite/compile_commands.json index 1f93dd8..747a12e 100644 --- a/.codelite/compile_commands.json +++ b/.codelite/compile_commands.json @@ -4,14 +4,6 @@ "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Workspace.cpp" }, { "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project", - "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/MainFrame.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/MainFrame.cpp.o -I. -I.", - "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\MainFrame.cpp" - }, { - "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project", "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/Workspace.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/Workspace.cpp.o -I. -I.", "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\Workspace.cpp" - }, { - "directory": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project", - "command": "C:/TDM-GCC-64/bin/g++.exe -c C:/Users/Thales/Documents/GitHub/PSP/Project/MouseEventsHandler.cpp -O2 -Wall -mthreads -DHAVE_W32API_H -D__WXMSW__ -DNDEBUG -D_UNICODE -IC:/wxWidgets-3.1.0/lib/gcc_dll/mswu -IC:/wxWidgets-3.1.0/include -DWXUSINGDLL -Wno-ctor-dtor-privacy -pipe -fmessage-length=0 -fno-keep-inline-dllexport -std=c++11 -DNDEBUG -DUNICODE -o ./Release/MouseEventsHandler.cpp.o -I. -I.", - "file": "C:\\Users\\Thales\\Documents\\GitHub\\PSP\\Project\\MouseEventsHandler.cpp" }]
\ No newline at end of file diff --git a/.codelite/refactoring.db b/.codelite/refactoring.db Binary files differindex d75f994..5e7c72d 100644 --- a/.codelite/refactoring.db +++ b/.codelite/refactoring.db diff --git a/Project/MainFrame.cpp b/Project/MainFrame.cpp index 7099b76..d2314e9 100644 --- a/Project/MainFrame.cpp +++ b/Project/MainFrame.cpp @@ -1,4 +1,6 @@ #include "MainFrame.h" +#include "ArtMetro.h" +#include "Workspace.h" MainFrame::MainFrame(wxWindow* parent, wxLocale* locale) : MainFrameBase(parent) { @@ -102,7 +104,7 @@ void MainFrame::OnNewClick(wxRibbonButtonBarEvent& event) EnableCurrentProjectRibbon(); Workspace* newWorkspace = - new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber, m_projectNumber)); + new Workspace(this, wxString::Format(_("New project %d"), m_projectNumber)); m_workspaceList.push_back(newWorkspace); m_ribbonButtonBarCircuit->ToggleButton(ID_RIBBON_DISABLESOL, true); diff --git a/Project/MainFrame.h b/Project/MainFrame.h index 8459926..22c49ab 100644 --- a/Project/MainFrame.h +++ b/Project/MainFrame.h @@ -5,8 +5,10 @@ #include <wx/msgdlg.h> #include "MainFrameBase.h" -#include "ArtMetro.h" -#include "Workspace.h" + +class MainFrameBase; +class wxRibbonMetroArtProvider; +class Workspace; enum { diff --git a/Project/MouseEventsHandler.cpp b/Project/MouseEventsHandler.cpp index ad59774..049b9bd 100644 --- a/Project/MouseEventsHandler.cpp +++ b/Project/MouseEventsHandler.cpp @@ -1,6 +1,7 @@ #include "MouseEventsHandler.h" +#include "Bus.h" -MouseEventsHandler::MouseEventsHandler(Workspace* workspace) : Workspace(workspace) +MouseEventsHandler::MouseEventsHandler(Workspace* workspace) : Workspace() { m_workspace = workspace; } @@ -11,10 +12,10 @@ MouseEventsHandler::~MouseEventsHandler() void MouseEventsHandler::OnKeyDown(wxKeyEvent& event) { - if(event.GetKeyCode() == 'B' && !m_workspace->m_insertMode) { + if(event.GetKeyCode() == 'B' && !m_workspace->IsInsertMode()) { Bus* newBus = new Bus(m_workspace->m_camera->ScreenToWorld(event.GetPosition())); - m_workspace->m_elementList.push_back(newBus); - m_workspace->m_insertMode = true; + m_workspace->GetElementList().push_back(newBus); + m_workspace->SetInsertMode(); m_workspace->Redraw(); } event.Skip(); diff --git a/Project/MouseEventsHandler.h b/Project/MouseEventsHandler.h index ab5680a..5b44084 100644 --- a/Project/MouseEventsHandler.h +++ b/Project/MouseEventsHandler.h @@ -11,7 +11,7 @@ public: MouseEventsHandler(Workspace* workspace); ~MouseEventsHandler(); - void OnKeyDown(wxKeyEvent& event); + virtual void OnKeyDown(wxKeyEvent& event); }; diff --git a/Project/Project.mk b/Project/Project.mk index fd1ea61..07e9471 100644 --- a/Project/Project.mk +++ b/Project/Project.mk @@ -13,8 +13,8 @@ CurrentFileName := CurrentFilePath := CurrentFileFullPath := User :=Thales -Date :=01/08/2016 -CodeLitePath :="C:/Program Files/CodeLite" +Date :=02/08/2016 +CodeLitePath :="C:/Program Files (x86)/CodeLite" LinkerName :=C:/TDM-GCC-64/bin/g++.exe SharedObjectLinkerName :=C:/TDM-GCC-64/bin/g++.exe -shared -fPIC ObjectSuffix :=.o @@ -61,7 +61,8 @@ AS := C:/TDM-GCC-64/bin/as.exe ## ## User defined environment variables ## -CodeLiteDir:=C:\Program Files\CodeLite +CodeLiteDir:=C:\Program Files (x86)\CodeLite +UNIT_TEST_PP_SRC_DIR:=C:\UnitTest++-1.3 WXWIN:=C:\wxWidgets-3.1.0 WXCFG:=gcc_dll\mswu Objects0=$(IntermediateDirectory)/main.cpp$(ObjectSuffix) $(IntermediateDirectory)/win_resources.rc$(ObjectSuffix) $(IntermediateDirectory)/Element.cpp$(ObjectSuffix) $(IntermediateDirectory)/Bus.cpp$(ObjectSuffix) $(IntermediateDirectory)/ArtMetro.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrame.cpp$(ObjectSuffix) $(IntermediateDirectory)/Workspace.cpp$(ObjectSuffix) $(IntermediateDirectory)/MouseEventsHandler.cpp$(ObjectSuffix) $(IntermediateDirectory)/MainFrameBitmaps.cpp$(ObjectSuffix) $(IntermediateDirectory)/WorkspaceBitmaps.cpp$(ObjectSuffix) \ diff --git a/Project/Project.txt b/Project/Project.txt index 29399f8..732479c 100644 --- a/Project/Project.txt +++ b/Project/Project.txt @@ -1 +1 @@ -./Release/win_resources.rc.o ./Release/Element.cpp.o ./Release/Bus.cpp.o ./Release/ArtMetro.cpp.o ./Release/MainFrame.cpp.o ./Release/main.cpp.o ./Release/Workspace.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o +./Release/main.cpp.o ./Release/win_resources.rc.o ./Release/Element.cpp.o ./Release/Bus.cpp.o ./Release/ArtMetro.cpp.o ./Release/MainFrame.cpp.o ./Release/Workspace.cpp.o ./Release/MouseEventsHandler.cpp.o ./Release/MainFrameBitmaps.cpp.o ./Release/WorkspaceBitmaps.cpp.o ./Release/MainFrameBase.cpp.o ./Release/WorkspaceBase.cpp.o diff --git a/Project/Release/MainFrame.cpp.o b/Project/Release/MainFrame.cpp.o Binary files differnew file mode 100644 index 0000000..c262e98 --- /dev/null +++ b/Project/Release/MainFrame.cpp.o diff --git a/Project/Release/MainFrame.cpp.o.d b/Project/Release/MainFrame.cpp.o.d index 267f9fb..537526d 100644 --- a/Project/Release/MainFrame.cpp.o.d +++ b/Project/Release/MainFrame.cpp.o.d @@ -205,7 +205,7 @@ Release/MainFrame.cpp.o: MainFrame.cpp MainFrame.h \ C:/wxWidgets-3.1.0/include/wx/log.h \ C:/wxWidgets-3.1.0/include/wx/generic/logg.h \ C:/wxWidgets-3.1.0/include/wx/msw/app.h \ - C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h Bus.h Element.h + C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h MainFrame.h: @@ -632,7 +632,3 @@ C:/wxWidgets-3.1.0/include/wx/generic/logg.h: C:/wxWidgets-3.1.0/include/wx/msw/app.h: C:/wxWidgets-3.1.0/include/wx/msw/glcanvas.h: - -Bus.h: - -Element.h: diff --git a/Project/Release/MouseEventsHandler.cpp.o b/Project/Release/MouseEventsHandler.cpp.o Binary files differnew file mode 100644 index 0000000..d93a2ad --- /dev/null +++ b/Project/Release/MouseEventsHandler.cpp.o diff --git a/Project/Release/PSP-UFU.exe b/Project/Release/PSP-UFU.exe Binary files differindex 3055ff0..2b91721 100644 --- a/Project/Release/PSP-UFU.exe +++ b/Project/Release/PSP-UFU.exe diff --git a/Project/Release/Workspace.cpp.o b/Project/Release/Workspace.cpp.o Binary files differindex fc530f0..e75d6b3 100644 --- a/Project/Release/Workspace.cpp.o +++ b/Project/Release/Workspace.cpp.o diff --git a/Project/Release/Workspace.cpp.o.d b/Project/Release/Workspace.cpp.o.d index 46f6f75..834fd1d 100644 --- a/Project/Release/Workspace.cpp.o.d +++ b/Project/Release/Workspace.cpp.o.d @@ -180,8 +180,8 @@ Release/Workspace.cpp.o: Workspace.cpp Workspace.h \ C:/wxWidgets-3.1.0/include/wx/ioswrap.h \ C:/wxWidgets-3.1.0/include/wx/msw/textctrl.h \ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h \ - C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h Bus.h Element.h \ - MouseEventsHandler.h + C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h MouseEventsHandler.h Bus.h \ + Element.h Workspace.h: @@ -553,8 +553,8 @@ C:/wxWidgets-3.1.0/include/wx/systhemectrl.h: C:/wxWidgets-3.1.0/include/wx/msw/treectrl.h: +MouseEventsHandler.h: + Bus.h: Element.h: - -MouseEventsHandler.h: diff --git a/Project/Workspace.cpp b/Project/Workspace.cpp index ec27039..367ca4a 100644 --- a/Project/Workspace.cpp +++ b/Project/Workspace.cpp @@ -1,29 +1,36 @@ #include "Workspace.h" + #include "MouseEventsHandler.h" +#include "Bus.h" +// Camera Camera::Camera() { - m_translation = wxPoint2DDouble(0,0); - m_scale = 1.0; + m_translation = wxPoint2DDouble(0, 0); + m_scale = 1.0; } -Camera::~Camera() +Camera::~Camera() {} +wxPoint2DDouble Camera::ScreenToWorld(wxPoint2DDouble screenCoords) { + return wxPoint2DDouble(screenCoords.m_x / m_scale - m_translation.m_x, + screenCoords.m_y / m_scale - m_translation.m_y); } -wxPoint2DDouble Camera::ScreenToWorld(wxPoint2DDouble screenCoords) +// Workspace +Workspace::Workspace() : WorkspaceBase(NULL) { - return wxPoint2DDouble(screenCoords.m_x / m_scale - m_translation.m_x, - screenCoords.m_y / m_scale - m_translation.m_y); + m_glContext = new wxGLContext(m_glCanvas); + m_camera = new Camera(); } -Workspace::Workspace(wxWindow* parent, wxString name /*, int workspaceID*/) : WorkspaceBase(parent) +Workspace::Workspace(wxWindow* parent, wxString name) : WorkspaceBase(parent) { m_name = name; // m_workspaceID = workspaceID; m_glContext = new wxGLContext(m_glCanvas); - m_mouseEventsHandler = new MouseEventsHandler(this); - m_camera = new Camera(); + m_mouseEventsHandler = new MouseEventsHandler(this); + m_camera = new Camera(); } Workspace::~Workspace() @@ -33,9 +40,9 @@ Workspace::~Workspace() if(!(*it)) delete *it; it++; } - - delete m_camera; - delete m_mouseEventsHandler; + + delete m_camera; + delete m_mouseEventsHandler; } void Workspace::OnPaint(wxPaintEvent& event) @@ -54,7 +61,7 @@ void Workspace::OnPaint(wxPaintEvent& event) glFlush(); m_glCanvas->SwapBuffers(); - event.Skip(); + event.Skip(); } void Workspace::SetViewport() @@ -84,28 +91,28 @@ void Workspace::SetViewport() void Workspace::OnLeftClickDown(wxMouseEvent& event) { if(m_insertMode) m_insertMode = false; - event.Skip(); + event.Skip(); } /* void Workspace::OnKeyDown(wxKeyEvent& event) { if(event.GetKeyCode() == 'B' && !m_insertMode) { - Bus* newBus = new Bus(m_camera->ScreenToWorld(event.GetPosition())); - m_elementList.push_back(newBus); - m_insertMode = true; - Redraw(); - } - event.Skip(); + Bus* newBus = new Bus(m_camera->ScreenToWorld(event.GetPosition())); + m_elementList.push_back(newBus); + m_insertMode = true; + Redraw(); + } + event.Skip(); }*/ void Workspace::OnMouseMotion(wxMouseEvent& event) { - if(m_insertMode) { - std::vector<Element*>::iterator it = m_elementList.end() - 1; - Element* element = *it; - element->SetPosition(m_camera->ScreenToWorld(event.GetPosition())); - Redraw(); + if(m_insertMode) { + std::vector<Element*>::iterator it = m_elementList.end() - 1; + Element* element = *it; + element->SetPosition(m_camera->ScreenToWorld(event.GetPosition())); + Redraw(); } - event.Skip(); + event.Skip(); } diff --git a/Project/Workspace.h b/Project/Workspace.h index ca4245f..ef837fb 100644 --- a/Project/Workspace.h +++ b/Project/Workspace.h @@ -6,11 +6,14 @@ #include <wx/dcclient.h> #include <wx/msgdlg.h> +#include "WorkspaceBase.h" + class MouseEventsHandler; +class Element; +class Bus; -#include "WorkspaceBase.h" //#include "MouseEventsHandler.h" -#include "Bus.h" +//#include "Bus.h" class Camera; @@ -18,7 +21,7 @@ class Workspace : public WorkspaceBase { protected: virtual void OnMouseMotion(wxMouseEvent& event); - virtual void OnKeyDown(wxKeyEvent& event) = 0; + virtual void OnKeyDown(wxKeyEvent& event) { event.Skip(); }; virtual void OnLeftClickDown(wxMouseEvent& event); virtual void OnPaint(wxPaintEvent& event); @@ -33,18 +36,19 @@ class Workspace : public WorkspaceBase std::vector<Element*> m_elementList; public: + Workspace(); Workspace(wxWindow* parent, wxString name = wxEmptyString); ~Workspace(); MouseEventsHandler* m_mouseEventsHandler; - Camera* m_camera; + Camera* m_camera; // why public? wxString GetName() const { return m_name; } void SetName(wxString name) { m_name = name; } - void SetDragMode(bool dragMode) { this->m_dragMode = dragMode; } - void SetInsertMode(bool insertMode) { this->m_insertMode = insertMode; } + void SetDragMode(bool dragMode = true) { this->m_dragMode = dragMode; } + void SetInsertMode(bool insertMode = true) { this->m_insertMode = insertMode; } bool IsDragMode() const { return m_dragMode; } - const std::vector<Element*>& GetElementList() const { return m_elementList; } + std::vector<Element*> GetElementList() { return m_elementList; } bool IsInsertMode() const { return m_insertMode; } void Redraw() { this->Refresh(); } }; |