From ab30228b1a57053323363674fa7f137c0329a180 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Tue, 7 Jul 2020 23:12:04 -0300 Subject: Voltage heat map implemented Voltage heat map implemented using modern OpenGL =) New external library required: -GLEW -GLFW -GLM (incorporeted at the source) Old memory leaks fixed =) --- Project/MainFrameBase.h | 95 ++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 48 deletions(-) (limited to 'Project/MainFrameBase.h') diff --git a/Project/MainFrameBase.h b/Project/MainFrameBase.h index f3f936e..e52e250 100644 --- a/Project/MainFrameBase.h +++ b/Project/MainFrameBase.h @@ -7,24 +7,24 @@ #ifndef _PSP_PROJECT_MAINFRAME_BASE_CLASSES_H #define _PSP_PROJECT_MAINFRAME_BASE_CLASSES_H -#include -#include +#include +#include +#include #include #include -#include +#include +#include #include -#include +#include #include #include -#include -#include +#include +#include #include -#include -#include #if wxVERSION_NUMBER >= 2900 #include -#include #include +#include #include #endif @@ -37,9 +37,10 @@ #define WXC_FROM_DIP(x) x #endif + class MainFrameBase : public wxFrame { - public: +public: enum { ID_RIBBON_FREQRESP = 10001, ID_RIBBON_SCPOWER = 10002, @@ -49,36 +50,36 @@ class MainFrameBase : public wxFrame ID_RIBBON_DISABLESOL = 10006, ID_RIBBON_ENABLESOL = 10007, ID_RIBBON_SNAPSHOT = 10008, - ID_RIBBON_PROJSETTINGS = 10009, - ID_RIBBON_CHARTS = 10010, - ID_RIBBON_ROTATEC = 10011, - ID_RIBBON_SIMULSETTINGS = 10012, - ID_RIBBON_DATAREPORT = 10013, - ID_RIBBON_FIT = 10014, - ID_RIBBON_MOVE = 10015, - ID_RIBBON_DRAG = 10016, - ID_RIBBON_ADDELEMENT = 10017, - ID_RIBBON_DELETE = 10018, - ID_RIBBON_REDO = 10019, - ID_RIBBON_UNDO = 10020, - ID_RIBBON_PASTE = 10021, - ID_RIBBON_ABOUT = 10022, - ID_RIBBON_GUIDE = 10023, - ID_RIBBON_HARMDIST = 10024, - ID_RIBBON_CLOSE = 10025, - ID_RIBBON_SAVEAS = 10026, - ID_RIBBON_SAVE = 10027, - ID_RIBBON_EXIT = 10028, - ID_RIBBON_GENSETTINGS = 10029, - ID_RIBBON_ROTATECC = 10030, - ID_RIBBON_COPY = 10031, - ID_RIBBON_IMPORT = 10032, - ID_RIBBON_OPEN = 10033, - ID_RIBBON_RESETVOLT = 10034, - ID_RIBBON_NEW = 10035, + ID_RIBBON_HEATMAP = 10009, + ID_RIBBON_PROJSETTINGS = 10010, + ID_RIBBON_CHARTS = 10011, + ID_RIBBON_ROTATEC = 10012, + ID_RIBBON_SIMULSETTINGS = 10013, + ID_RIBBON_DATAREPORT = 10014, + ID_RIBBON_FIT = 10015, + ID_RIBBON_MOVE = 10016, + ID_RIBBON_DRAG = 10017, + ID_RIBBON_ADDELEMENT = 10018, + ID_RIBBON_DELETE = 10019, + ID_RIBBON_REDO = 10020, + ID_RIBBON_UNDO = 10021, + ID_RIBBON_PASTE = 10022, + ID_RIBBON_ABOUT = 10023, + ID_RIBBON_GUIDE = 10024, + ID_RIBBON_HARMDIST = 10025, + ID_RIBBON_CLOSE = 10026, + ID_RIBBON_SAVEAS = 10027, + ID_RIBBON_SAVE = 10028, + ID_RIBBON_EXIT = 10029, + ID_RIBBON_GENSETTINGS = 10030, + ID_RIBBON_ROTATECC = 10031, + ID_RIBBON_COPY = 10032, + ID_RIBBON_IMPORT = 10033, + ID_RIBBON_OPEN = 10034, + ID_RIBBON_RESETVOLT = 10035, + ID_RIBBON_NEW = 10036, }; - - protected: +protected: wxRibbonBar* m_ribbonBar; wxRibbonPage* m_ribbonPageFile; wxRibbonPanel* m_ribbonPanelProjects; @@ -102,7 +103,8 @@ class MainFrameBase : public wxFrame wxAuiNotebook* m_auiNotebook; wxStatusBar* m_statusBar; - protected: +protected: + virtual void OnClose(wxCloseEvent& event) { event.Skip(); } virtual void OnNewClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnOpenClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnImportClick(wxRibbonButtonBarEvent& event) { event.Skip(); } @@ -124,8 +126,10 @@ class MainFrameBase : public wxFrame virtual void OnFitClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnRotClockClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnRotCounterClockClick(wxRibbonButtonBarEvent& event) { event.Skip(); } + virtual void OnProjectSettingsClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnDataReportClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnChartsClick(wxRibbonButtonBarEvent& event) { event.Skip(); } + virtual void OnHeatmapClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnSnapshotClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnEnableSolutionClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void OnDisableSolutionClick(wxRibbonButtonBarEvent& event) { event.Skip(); } @@ -140,18 +144,13 @@ class MainFrameBase : public wxFrame virtual void OnSimulationSettingsClick(wxRibbonButtonBarEvent& event) { event.Skip(); } virtual void NotebookPageClosing(wxAuiNotebookEvent& event) { event.Skip(); } virtual void NotebookPageClosed(wxAuiNotebookEvent& event) { event.Skip(); } + virtual void OnNotebookPageChanged(wxAuiNotebookEvent& event) { event.Skip(); } - public: +public: wxRibbonBar* GetRibbonBar() { return m_ribbonBar; } wxAuiNotebook* GetAuiNotebook() { return m_auiNotebook; } wxStatusBar* GetStatusBar() { return m_statusBar; } - MainFrameBase(wxWindow* parent, - wxWindowID id = wxID_ANY, - const wxString& title = _("PSP-UFU"), - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxSize(800, 600), - long style = wxCAPTION | wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMINIMIZE_BOX | wxSYSTEM_MENU | - wxCLOSE_BOX); + MainFrameBase(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("PSP-UFU"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize(800,600), long style = wxCAPTION|wxRESIZE_BORDER|wxMAXIMIZE_BOX|wxMINIMIZE_BOX|wxSYSTEM_MENU|wxCLOSE_BOX); virtual ~MainFrameBase(); }; -- cgit