From ddb262a4d6bed48ac68eeed99032e10c49c02996 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 18 Jan 2017 19:45:49 -0200 Subject: Control editor implementation start --- Project/ControlEditorBase.cpp | 93 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 93 insertions(+) create mode 100644 Project/ControlEditorBase.cpp (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp new file mode 100644 index 0000000..f576467 --- /dev/null +++ b/Project/ControlEditorBase.cpp @@ -0,0 +1,93 @@ +////////////////////////////////////////////////////////////////////// +// This file was auto-generated by codelite's wxCrafter Plugin +// wxCrafter project file: ControlEditor.wxcp +// Do not modify this file by hand! +////////////////////////////////////////////////////////////////////// + +#include "ControlEditorBase.h" + + +// Declare the bitmap loading function +extern void wxC870InitBitmapResources(); + +static bool bBitmapLoaded = false; + + +ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style) + : wxFrame(parent, id, title, pos, size, style) +{ + if ( !bBitmapLoaded ) { + // We need to initialise the default bitmap handler + wxXmlResource::Get()->AddHandler(new wxBitmapXmlHandler); + wxC870InitBitmapResources(); + bBitmapLoaded = true; + } + + wxBoxSizer* boxSizer3 = new wxBoxSizer(wxHORIZONTAL); + this->SetSizer(boxSizer3); + + m_splitter157 = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxSP_3D); + m_splitter157->SetSashGravity(0.2); + m_splitter157->SetMinimumPaneSize(10); + + boxSizer3->Add(m_splitter157, 1, wxEXPAND, WXC_FROM_DIP(5)); + + m_splitterPage163 = new wxPanel(m_splitter157, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_splitter157, wxSize(-1,-1)), wxTAB_TRAVERSAL); + + wxBoxSizer* boxSizer169 = new wxBoxSizer(wxHORIZONTAL); + m_splitterPage163->SetSizer(boxSizer169); + + m_scrollWin201 = new wxScrolledWindow(m_splitterPage163, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_splitterPage163, wxSize(-1,-1)), wxBORDER_SIMPLE|wxHSCROLL|wxVSCROLL); + m_scrollWin201->SetScrollRate(5, 5); + + boxSizer169->Add(m_scrollWin201, 1, wxEXPAND, WXC_FROM_DIP(5)); + + wxBoxSizer* boxSizer203 = new wxBoxSizer(wxHORIZONTAL); + m_scrollWin201->SetSizer(boxSizer203); + + m_bmpButton19934 = new wxBitmapButton(m_scrollWin201, wxID_ANY, wxArtProvider::GetBitmap(wxART_FOLDER, wxART_FRAME_ICON, wxDefaultSize), wxDefaultPosition, wxDLG_UNIT(m_scrollWin201, wxSize(-1,-1)), wxBU_AUTODRAW); + m_bmpButton19934->SetDefault(); + boxSizer203->Add(m_bmpButton19934, 0, wxALL, WXC_FROM_DIP(5)); + + m_bmpButton1993 = new wxBitmapButton(m_scrollWin201, wxID_ANY, wxArtProvider::GetBitmap(wxART_FOLDER, wxART_FRAME_ICON, wxDefaultSize), wxDefaultPosition, wxDLG_UNIT(m_scrollWin201, wxSize(-1,-1)), wxBU_AUTODRAW); + m_bmpButton1993->SetDefault(); + boxSizer203->Add(m_bmpButton1993, 0, wxALL, WXC_FROM_DIP(5)); + + m_bmpButton199 = new wxBitmapButton(m_scrollWin201, wxID_ANY, wxArtProvider::GetBitmap(wxART_FOLDER, wxART_FRAME_ICON, wxDefaultSize), wxDefaultPosition, wxDLG_UNIT(m_scrollWin201, wxSize(-1,-1)), wxBU_AUTODRAW); + m_bmpButton199->SetDefault(); + boxSizer203->Add(m_bmpButton199, 0, wxALL, WXC_FROM_DIP(5)); + + m_splitterPage175 = new wxPanel(m_splitter157, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_splitter157, wxSize(-1,-1)), wxTAB_TRAVERSAL); + m_splitter157->SplitVertically(m_splitterPage163, m_splitterPage175, 0); + + wxBoxSizer* boxSizer177 = new wxBoxSizer(wxVERTICAL); + m_splitterPage175->SetSizer(boxSizer177); + + int *m_glCanvas147Attr = NULL; + m_glCanvas147 = new wxGLCanvas(m_splitterPage175, wxID_ANY, m_glCanvas147Attr, wxDefaultPosition, wxDLG_UNIT(m_splitterPage175, wxSize(-1,-1)), wxBORDER_SIMPLE); + wxDELETEA( m_glCanvas147Attr ); + + boxSizer177->Add(m_glCanvas147, 1, wxEXPAND, WXC_FROM_DIP(5)); + + SetName(wxT("ControlEditorBase")); + SetSize(500,300); + if (GetSizer()) { + GetSizer()->Fit(this); + } + if(GetParent()) { + CentreOnParent(wxBOTH); + } else { + CentreOnScreen(wxBOTH); + } +#if wxVERSION_NUMBER >= 2900 + if(!wxPersistenceManager::Get().Find(this)) { + wxPersistenceManager::Get().RegisterAndRestore(this); + } else { + wxPersistenceManager::Get().Restore(this); + } +#endif +} + +ControlEditorBase::~ControlEditorBase() +{ +} -- cgit From 864842440bb7fd9f8495314b8bfa2e2c8a0d47f4 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Thu, 19 Jan 2017 19:18:16 -0200 Subject: Cunston control element button implementation --- Project/ControlEditorBase.cpp | 77 +++++++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 32 deletions(-) (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index f576467..e0f7d8b 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -23,54 +23,64 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt bBitmapLoaded = true; } - wxBoxSizer* boxSizer3 = new wxBoxSizer(wxHORIZONTAL); - this->SetSizer(boxSizer3); + m_toolbarMain = this->CreateToolBar(wxTB_TEXT|wxTB_FLAT, wxID_ANY); + m_toolbarMain->SetToolBitmapSize(wxSize(32,32)); - m_splitter157 = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxSP_3D); - m_splitter157->SetSashGravity(0.2); - m_splitter157->SetMinimumPaneSize(10); + m_toolbarMain->AddTool(wxID_ANY, _("New"), wxXmlResource::Get()->LoadBitmap(wxT("new32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - boxSizer3->Add(m_splitter157, 1, wxEXPAND, WXC_FROM_DIP(5)); + m_toolbarMain->AddTool(wxID_ANY, _("Import"), wxXmlResource::Get()->LoadBitmap(wxT("imp32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - m_splitterPage163 = new wxPanel(m_splitter157, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_splitter157, wxSize(-1,-1)), wxTAB_TRAVERSAL); + m_toolbarMain->AddTool(wxID_ANY, _("Export"), wxXmlResource::Get()->LoadBitmap(wxT("exp32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - wxBoxSizer* boxSizer169 = new wxBoxSizer(wxHORIZONTAL); - m_splitterPage163->SetSizer(boxSizer169); + m_toolbarMain->AddSeparator(); - m_scrollWin201 = new wxScrolledWindow(m_splitterPage163, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_splitterPage163, wxSize(-1,-1)), wxBORDER_SIMPLE|wxHSCROLL|wxVSCROLL); - m_scrollWin201->SetScrollRate(5, 5); + m_toolbarMain->AddTool(wxID_ANY, _("Copy"), wxXmlResource::Get()->LoadBitmap(wxT("copy32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - boxSizer169->Add(m_scrollWin201, 1, wxEXPAND, WXC_FROM_DIP(5)); + m_toolbarMain->AddTool(wxID_ANY, _("Paste"), wxXmlResource::Get()->LoadBitmap(wxT("paste32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - wxBoxSizer* boxSizer203 = new wxBoxSizer(wxHORIZONTAL); - m_scrollWin201->SetSizer(boxSizer203); + m_toolbarMain->AddTool(wxID_ANY, _("Undo"), wxXmlResource::Get()->LoadBitmap(wxT("undo32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - m_bmpButton19934 = new wxBitmapButton(m_scrollWin201, wxID_ANY, wxArtProvider::GetBitmap(wxART_FOLDER, wxART_FRAME_ICON, wxDefaultSize), wxDefaultPosition, wxDLG_UNIT(m_scrollWin201, wxSize(-1,-1)), wxBU_AUTODRAW); - m_bmpButton19934->SetDefault(); - boxSizer203->Add(m_bmpButton19934, 0, wxALL, WXC_FROM_DIP(5)); + m_toolbarMain->AddTool(wxID_ANY, _("Redo"), wxXmlResource::Get()->LoadBitmap(wxT("redo32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - m_bmpButton1993 = new wxBitmapButton(m_scrollWin201, wxID_ANY, wxArtProvider::GetBitmap(wxART_FOLDER, wxART_FRAME_ICON, wxDefaultSize), wxDefaultPosition, wxDLG_UNIT(m_scrollWin201, wxSize(-1,-1)), wxBU_AUTODRAW); - m_bmpButton1993->SetDefault(); - boxSizer203->Add(m_bmpButton1993, 0, wxALL, WXC_FROM_DIP(5)); + m_toolbarMain->AddSeparator(); - m_bmpButton199 = new wxBitmapButton(m_scrollWin201, wxID_ANY, wxArtProvider::GetBitmap(wxART_FOLDER, wxART_FRAME_ICON, wxDefaultSize), wxDefaultPosition, wxDLG_UNIT(m_scrollWin201, wxSize(-1,-1)), wxBU_AUTODRAW); - m_bmpButton199->SetDefault(); - boxSizer203->Add(m_bmpButton199, 0, wxALL, WXC_FROM_DIP(5)); + m_toolbarMain->AddTool(wxID_ANY, _("Drag"), wxXmlResource::Get()->LoadBitmap(wxT("drag32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - m_splitterPage175 = new wxPanel(m_splitter157, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(m_splitter157, wxSize(-1,-1)), wxTAB_TRAVERSAL); - m_splitter157->SplitVertically(m_splitterPage163, m_splitterPage175, 0); + m_toolbarMain->AddTool(wxID_ANY, _("Move"), wxXmlResource::Get()->LoadBitmap(wxT("move32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - wxBoxSizer* boxSizer177 = new wxBoxSizer(wxVERTICAL); - m_splitterPage175->SetSizer(boxSizer177); + m_toolbarMain->AddTool(wxID_ANY, _("Delete"), wxXmlResource::Get()->LoadBitmap(wxT("delete32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); + m_toolbarMain->Realize(); - int *m_glCanvas147Attr = NULL; - m_glCanvas147 = new wxGLCanvas(m_splitterPage175, wxID_ANY, m_glCanvas147Attr, wxDefaultPosition, wxDLG_UNIT(m_splitterPage175, wxSize(-1,-1)), wxBORDER_SIMPLE); - wxDELETEA( m_glCanvas147Attr ); + m_auimgr = new wxAuiManager; + m_auimgr->SetManagedWindow( this ); + m_auimgr->SetFlags( wxAUI_MGR_LIVE_RESIZE|wxAUI_MGR_TRANSPARENT_HINT|wxAUI_MGR_TRANSPARENT_DRAG|wxAUI_MGR_ALLOW_ACTIVE_PANE|wxAUI_MGR_ALLOW_FLOATING); + m_auimgr->GetArtProvider()->SetMetric(wxAUI_DOCKART_GRADIENT_TYPE, wxAUI_GRADIENT_NONE); - boxSizer177->Add(m_glCanvas147, 1, wxEXPAND, WXC_FROM_DIP(5)); + m_panelControlElements = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL); + m_panelControlElements->SetBackgroundColour(wxColour(wxT("rgb(255,255,255)"))); + + m_auimgr->AddPane(m_panelControlElements, wxAuiPaneInfo().Caption(_("Control elements")).Direction(wxAUI_DOCK_LEFT).Layer(0).Row(0).Position(0).BestSize(200,200).MinSize(200,200).MaxSize(200,200).CaptionVisible(true).MaximizeButton(false).CloseButton(false).MinimizeButton(false).PinButton(false)); + + m_panelWorkspace = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL); + + m_auimgr->AddPane(m_panelWorkspace, wxAuiPaneInfo().Direction(wxAUI_DOCK_CENTER).Layer(0).Row(0).Position(0).BestSize(100,100).MinSize(100,100).MaxSize(100,100).Fixed().CaptionVisible(false).MaximizeButton(false).CloseButton(false).MinimizeButton(false).PinButton(false)); + m_auimgr->Update(); + + wxBoxSizer* boxSizerLvl2_1 = new wxBoxSizer(wxVERTICAL); + m_panelWorkspace->SetSizer(boxSizerLvl2_1); + + int *m_glCanvasAttr = NULL; + m_glCanvas = new wxGLCanvas(m_panelWorkspace, wxID_ANY, m_glCanvasAttr, wxDefaultPosition, wxDLG_UNIT(m_panelWorkspace, wxSize(-1,-1)), 0); + wxDELETEA( m_glCanvasAttr ); + + boxSizerLvl2_1->Add(m_glCanvas, 1, wxEXPAND, WXC_FROM_DIP(5)); + + m_statusBarMain = new wxStatusBar(this, wxID_ANY, wxSTB_DEFAULT_STYLE); + m_statusBarMain->SetFieldsCount(1); + this->SetStatusBar(m_statusBarMain); SetName(wxT("ControlEditorBase")); - SetSize(500,300); + SetSize(800,600); if (GetSizer()) { GetSizer()->Fit(this); } @@ -90,4 +100,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt ControlEditorBase::~ControlEditorBase() { + m_auimgr->UnInit(); + delete m_auimgr; + } -- cgit From 9d29dde68863f207eba2d84746cd38094810932d Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 20 Jan 2017 18:19:59 -0200 Subject: Button click event trigger implemented --- Project/ControlEditorBase.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index e0f7d8b..440069e 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -59,7 +59,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt m_panelControlElements = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL); m_panelControlElements->SetBackgroundColour(wxColour(wxT("rgb(255,255,255)"))); - m_auimgr->AddPane(m_panelControlElements, wxAuiPaneInfo().Caption(_("Control elements")).Direction(wxAUI_DOCK_LEFT).Layer(0).Row(0).Position(0).BestSize(200,200).MinSize(200,200).MaxSize(200,200).CaptionVisible(true).MaximizeButton(false).CloseButton(false).MinimizeButton(false).PinButton(false)); + m_auimgr->AddPane(m_panelControlElements, wxAuiPaneInfo().Name(wxT("m_controlElementsPanel")).Caption(_("Control elements")).Direction(wxAUI_DOCK_LEFT).Layer(0).Row(0).Position(0).BestSize(200,200).MinSize(10,10).MaxSize(200,200).CaptionVisible(true).MaximizeButton(false).CloseButton(false).MinimizeButton(true).PinButton(false)); m_panelWorkspace = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL); -- cgit From bdb0625280d827ba7333b6fc9d6c6534e0720100 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Tue, 24 Jan 2017 18:25:17 -0200 Subject: Control editor implementation start --- Project/ControlEditorBase.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index 440069e..bc0a1aa 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -96,10 +96,27 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt wxPersistenceManager::Get().Restore(this); } #endif + // Connect events + m_glCanvas->Connect(wxEVT_PAINT, wxPaintEventHandler(ControlEditorBase::OnPaint), NULL, this); + m_glCanvas->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(ControlEditorBase::OnLeftClickDown), NULL, this); + m_glCanvas->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(ControlEditorBase::OnLeftClickUp), NULL, this); + m_glCanvas->Connect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(ControlEditorBase::OnDoubleClick), NULL, this); + m_glCanvas->Connect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(ControlEditorBase::OnMiddleDown), NULL, this); + m_glCanvas->Connect(wxEVT_MIDDLE_UP, wxMouseEventHandler(ControlEditorBase::OnMiddleUp), NULL, this); + m_glCanvas->Connect(wxEVT_MOTION, wxMouseEventHandler(ControlEditorBase::OnMouseMotion), NULL, this); + } ControlEditorBase::~ControlEditorBase() { + m_glCanvas->Disconnect(wxEVT_PAINT, wxPaintEventHandler(ControlEditorBase::OnPaint), NULL, this); + m_glCanvas->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(ControlEditorBase::OnLeftClickDown), NULL, this); + m_glCanvas->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(ControlEditorBase::OnLeftClickUp), NULL, this); + m_glCanvas->Disconnect(wxEVT_LEFT_DCLICK, wxMouseEventHandler(ControlEditorBase::OnDoubleClick), NULL, this); + m_glCanvas->Disconnect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(ControlEditorBase::OnMiddleDown), NULL, this); + m_glCanvas->Disconnect(wxEVT_MIDDLE_UP, wxMouseEventHandler(ControlEditorBase::OnMiddleUp), NULL, this); + m_glCanvas->Disconnect(wxEVT_MOTION, wxMouseEventHandler(ControlEditorBase::OnMouseMotion), NULL, this); + m_auimgr->UnInit(); delete m_auimgr; -- cgit From 9f17be8af02011f04d188ce991921f6eb0ecf792 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Wed, 25 Jan 2017 19:45:45 -0200 Subject: Several graphic tools implemented, tf start --- Project/ControlEditorBase.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index bc0a1aa..32dcc88 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -59,7 +59,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt m_panelControlElements = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL); m_panelControlElements->SetBackgroundColour(wxColour(wxT("rgb(255,255,255)"))); - m_auimgr->AddPane(m_panelControlElements, wxAuiPaneInfo().Name(wxT("m_controlElementsPanel")).Caption(_("Control elements")).Direction(wxAUI_DOCK_LEFT).Layer(0).Row(0).Position(0).BestSize(200,200).MinSize(10,10).MaxSize(200,200).CaptionVisible(true).MaximizeButton(false).CloseButton(false).MinimizeButton(true).PinButton(false)); + m_auimgr->AddPane(m_panelControlElements, wxAuiPaneInfo().Name(wxT("m_controlElementsPanel")).Caption(_("Control elements")).Direction(wxAUI_DOCK_LEFT).Layer(0).Row(0).Position(0).BestSize(200,200).MinSize(10,10).MaxSize(200,200).CaptionVisible(true).MaximizeButton(false).CloseButton(false).MinimizeButton(true).PinButton(true)); m_panelWorkspace = new wxPanel(this, wxID_ANY, wxDefaultPosition, wxDLG_UNIT(this, wxSize(-1,-1)), wxTAB_TRAVERSAL); @@ -104,6 +104,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt m_glCanvas->Connect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(ControlEditorBase::OnMiddleDown), NULL, this); m_glCanvas->Connect(wxEVT_MIDDLE_UP, wxMouseEventHandler(ControlEditorBase::OnMiddleUp), NULL, this); m_glCanvas->Connect(wxEVT_MOTION, wxMouseEventHandler(ControlEditorBase::OnMouseMotion), NULL, this); + m_glCanvas->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(ControlEditorBase::OnScroll), NULL, this); } @@ -116,6 +117,7 @@ ControlEditorBase::~ControlEditorBase() m_glCanvas->Disconnect(wxEVT_MIDDLE_DOWN, wxMouseEventHandler(ControlEditorBase::OnMiddleDown), NULL, this); m_glCanvas->Disconnect(wxEVT_MIDDLE_UP, wxMouseEventHandler(ControlEditorBase::OnMiddleUp), NULL, this); m_glCanvas->Disconnect(wxEVT_MOTION, wxMouseEventHandler(ControlEditorBase::OnMouseMotion), NULL, this); + m_glCanvas->Disconnect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(ControlEditorBase::OnScroll), NULL, this); m_auimgr->UnInit(); delete m_auimgr; -- cgit From 10bb7105946bc0a892a9daf42ec5181ad9994fcf Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Fri, 27 Jan 2017 19:57:18 -0200 Subject: several control elements methods implemented Node position buggy --- Project/ControlEditorBase.cpp | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index 32dcc88..87c1f98 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -22,6 +22,40 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt wxC870InitBitmapResources(); bBitmapLoaded = true; } + // Set icon(s) to the application/dialog + wxIconBundle app_icons; + { + wxBitmap iconBmp = wxXmlResource::Get()->LoadBitmap(wxT("ctrlEditor16")); + wxIcon icn; + icn.CopyFromBitmap(iconBmp); + app_icons.AddIcon( icn ); + } + { + wxBitmap iconBmp = wxXmlResource::Get()->LoadBitmap(wxT("ctrlEditor32")); + wxIcon icn; + icn.CopyFromBitmap(iconBmp); + app_icons.AddIcon( icn ); + } + { + wxBitmap iconBmp = wxXmlResource::Get()->LoadBitmap(wxT("ctrlEditor64")); + wxIcon icn; + icn.CopyFromBitmap(iconBmp); + app_icons.AddIcon( icn ); + } + { + wxBitmap iconBmp = wxXmlResource::Get()->LoadBitmap(wxT("ctrlEditor128")); + wxIcon icn; + icn.CopyFromBitmap(iconBmp); + app_icons.AddIcon( icn ); + } + { + wxBitmap iconBmp = wxXmlResource::Get()->LoadBitmap(wxT("ctrlEditor256")); + wxIcon icn; + icn.CopyFromBitmap(iconBmp); + app_icons.AddIcon( icn ); + } + SetIcons( app_icons ); + m_toolbarMain = this->CreateToolBar(wxTB_TEXT|wxTB_FLAT, wxID_ANY); m_toolbarMain->SetToolBitmapSize(wxSize(32,32)); @@ -105,6 +139,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt m_glCanvas->Connect(wxEVT_MIDDLE_UP, wxMouseEventHandler(ControlEditorBase::OnMiddleUp), NULL, this); m_glCanvas->Connect(wxEVT_MOTION, wxMouseEventHandler(ControlEditorBase::OnMouseMotion), NULL, this); m_glCanvas->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(ControlEditorBase::OnScroll), NULL, this); + m_glCanvas->Connect(wxEVT_IDLE, wxIdleEventHandler(ControlEditorBase::OnIdle), NULL, this); } @@ -118,6 +153,7 @@ ControlEditorBase::~ControlEditorBase() m_glCanvas->Disconnect(wxEVT_MIDDLE_UP, wxMouseEventHandler(ControlEditorBase::OnMiddleUp), NULL, this); m_glCanvas->Disconnect(wxEVT_MOTION, wxMouseEventHandler(ControlEditorBase::OnMouseMotion), NULL, this); m_glCanvas->Disconnect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(ControlEditorBase::OnScroll), NULL, this); + m_glCanvas->Disconnect(wxEVT_IDLE, wxIdleEventHandler(ControlEditorBase::OnIdle), NULL, this); m_auimgr->UnInit(); delete m_auimgr; -- cgit From 4ddc7be64451db873e49169e951532ce8893e359 Mon Sep 17 00:00:00 2001 From: Thales1330 Date: Fri, 3 Mar 2017 18:50:40 -0300 Subject: More connection line methods implemented --- Project/ControlEditorBase.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index 87c1f98..5d350ca 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -140,6 +140,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt m_glCanvas->Connect(wxEVT_MOTION, wxMouseEventHandler(ControlEditorBase::OnMouseMotion), NULL, this); m_glCanvas->Connect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(ControlEditorBase::OnScroll), NULL, this); m_glCanvas->Connect(wxEVT_IDLE, wxIdleEventHandler(ControlEditorBase::OnIdle), NULL, this); + m_glCanvas->Connect(wxEVT_KEY_DOWN, wxKeyEventHandler(ControlEditorBase::OnKeyDown), NULL, this); } @@ -154,6 +155,7 @@ ControlEditorBase::~ControlEditorBase() m_glCanvas->Disconnect(wxEVT_MOTION, wxMouseEventHandler(ControlEditorBase::OnMouseMotion), NULL, this); m_glCanvas->Disconnect(wxEVT_MOUSEWHEEL, wxMouseEventHandler(ControlEditorBase::OnScroll), NULL, this); m_glCanvas->Disconnect(wxEVT_IDLE, wxIdleEventHandler(ControlEditorBase::OnIdle), NULL, this); + m_glCanvas->Disconnect(wxEVT_KEY_DOWN, wxKeyEventHandler(ControlEditorBase::OnKeyDown), NULL, this); m_auimgr->UnInit(); delete m_auimgr; -- cgit From a684d5c9c9dd131060b5a36d7c7844ae197fcfd1 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Fri, 31 Mar 2017 18:16:05 -0300 Subject: Exponencial implemented --- Project/ControlEditorBase.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index 5d350ca..8ad5899 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -103,7 +103,12 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt wxBoxSizer* boxSizerLvl2_1 = new wxBoxSizer(wxVERTICAL); m_panelWorkspace->SetSizer(boxSizerLvl2_1); - int *m_glCanvasAttr = NULL; + int *m_glCanvasAttr = new int[ 5 ]; + m_glCanvasAttr[0] = WX_GL_SAMPLE_BUFFERS; + m_glCanvasAttr[1] = 1; + m_glCanvasAttr[2] = WX_GL_SAMPLES; + m_glCanvasAttr[3] = 4; + m_glCanvasAttr[4] = 0; m_glCanvas = new wxGLCanvas(m_panelWorkspace, wxID_ANY, m_glCanvasAttr, wxDefaultPosition, wxDLG_UNIT(m_panelWorkspace, wxSize(-1,-1)), 0); wxDELETEA( m_glCanvasAttr ); -- cgit From f19803bc64885bcfaef15cfd7a8139c28d3dd506 Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Sat, 8 Apr 2017 16:31:25 -0300 Subject: Control editor export under implementation File handling --- Project/ControlEditorBase.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index 8ad5899..4fe00fc 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -136,6 +136,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt } #endif // Connect events + this->Connect(wxID_ANY, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnExportClick), NULL, this); m_glCanvas->Connect(wxEVT_PAINT, wxPaintEventHandler(ControlEditorBase::OnPaint), NULL, this); m_glCanvas->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(ControlEditorBase::OnLeftClickDown), NULL, this); m_glCanvas->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(ControlEditorBase::OnLeftClickUp), NULL, this); @@ -151,6 +152,7 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt ControlEditorBase::~ControlEditorBase() { + this->Disconnect(wxID_ANY, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnExportClick), NULL, this); m_glCanvas->Disconnect(wxEVT_PAINT, wxPaintEventHandler(ControlEditorBase::OnPaint), NULL, this); m_glCanvas->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(ControlEditorBase::OnLeftClickDown), NULL, this); m_glCanvas->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(ControlEditorBase::OnLeftClickUp), NULL, this); -- cgit From 52931022eb25080e33f2362c3b0bd4361f0cdb0b Mon Sep 17 00:00:00 2001 From: Thales Lima Oliveira Date: Wed, 12 Apr 2017 18:57:10 -0300 Subject: Open control implementation --- Project/ControlEditorBase.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Project/ControlEditorBase.cpp') diff --git a/Project/ControlEditorBase.cpp b/Project/ControlEditorBase.cpp index 4fe00fc..1156e7b 100644 --- a/Project/ControlEditorBase.cpp +++ b/Project/ControlEditorBase.cpp @@ -62,9 +62,9 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt m_toolbarMain->AddTool(wxID_ANY, _("New"), wxXmlResource::Get()->LoadBitmap(wxT("new32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - m_toolbarMain->AddTool(wxID_ANY, _("Import"), wxXmlResource::Get()->LoadBitmap(wxT("imp32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); + m_toolbarMain->AddTool(ID_RIBBON_IMPORT, _("Import"), wxXmlResource::Get()->LoadBitmap(wxT("imp32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); - m_toolbarMain->AddTool(wxID_ANY, _("Export"), wxXmlResource::Get()->LoadBitmap(wxT("exp32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); + m_toolbarMain->AddTool(ID_RIBBON_EXPORT, _("Export"), wxXmlResource::Get()->LoadBitmap(wxT("exp32")), wxNullBitmap, wxITEM_NORMAL, wxT(""), wxT(""), NULL); m_toolbarMain->AddSeparator(); @@ -136,7 +136,8 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt } #endif // Connect events - this->Connect(wxID_ANY, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnExportClick), NULL, this); + this->Connect(ID_RIBBON_IMPORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnImportClick), NULL, this); + this->Connect(ID_RIBBON_EXPORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnExportClick), NULL, this); m_glCanvas->Connect(wxEVT_PAINT, wxPaintEventHandler(ControlEditorBase::OnPaint), NULL, this); m_glCanvas->Connect(wxEVT_LEFT_DOWN, wxMouseEventHandler(ControlEditorBase::OnLeftClickDown), NULL, this); m_glCanvas->Connect(wxEVT_LEFT_UP, wxMouseEventHandler(ControlEditorBase::OnLeftClickUp), NULL, this); @@ -152,7 +153,8 @@ ControlEditorBase::ControlEditorBase(wxWindow* parent, wxWindowID id, const wxSt ControlEditorBase::~ControlEditorBase() { - this->Disconnect(wxID_ANY, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnExportClick), NULL, this); + this->Disconnect(ID_RIBBON_IMPORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnImportClick), NULL, this); + this->Disconnect(ID_RIBBON_EXPORT, wxEVT_COMMAND_TOOL_CLICKED, wxCommandEventHandler(ControlEditorBase::OnExportClick), NULL, this); m_glCanvas->Disconnect(wxEVT_PAINT, wxPaintEventHandler(ControlEditorBase::OnPaint), NULL, this); m_glCanvas->Disconnect(wxEVT_LEFT_DOWN, wxMouseEventHandler(ControlEditorBase::OnLeftClickDown), NULL, this); m_glCanvas->Disconnect(wxEVT_LEFT_UP, wxMouseEventHandler(ControlEditorBase::OnLeftClickUp), NULL, this); -- cgit