Now it works when a tab is changed ...

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h
index 7949d5bab16a1588e2fadb2fced661915a609fd4..0431d7eedd70edace32af53d580a924fa8838325 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/GlobalConstants.h
@@ -138,6 +138,8 @@ namespace bbtk
        const int ID_RUN = 1003;
        const int ID_DELETEALL = 1004;
        const int ID_CENTERVIEW = 1005;
+
+       const int wxID_NOTEBOOK = 1010;
 }
 // namespace bbtk
 #endif

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index ddc5a5285010ad854e3fb513e876d165ddc595be..c32ed022a3ca8d7e545d4330644609bc08634d59 100644 (file)
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
@@ -65,7 +65,7 @@ namespace bbtk
        void wxVtkSceneManager::disconnectDrop()
        {
                _baseView->GetWxVTKRenderWindowInteractor()->SetDropTarget(NULL);
-       }
+       }
 
        //=========================================================================
 
@@ -767,7 +767,6 @@ namespace bbtk
                else if(control->getGObjectType()==GCONNECTOR)
                {                       
                        GConnectorModel *conMod = (GConnectorModel*)control->getModel();
-                       cout<<"RaC wxVtkSceneManager::deleteObject id:"<<id<<" modelId:" <<conMod->getObjectId()<<endl;
                        controllersToRemove.push_back(conMod->getObjectId());
                }
 

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index b07e136f12d367bf8058a5b8175227891645a37f..35c4e77cf7c07ad4bb18da7296232982a9863815 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -150,7 +150,7 @@ namespace bbtk
        //=========================================================================
        void wxGUIEditorGraphicBBS::initTabPanelsManager()
        {
-               _notebook = new wxAuiNotebook(this,wxID_ANY,wxDefaultPosition,wxDefaultSize,wxAUI_NB_TOP|wxAUI_NB_TAB_MOVE|wxAUI_NB_CLOSE_ON_ACTIVE_TAB|wxAUI_NB_TAB_FIXED_WIDTH|wxAUI_NB_WINDOWLIST_BUTTON);
+               _notebook = new wxAuiNotebook(this,wxID_NOTEBOOK,wxDefaultPosition,wxDefaultSize,wxAUI_NB_TOP|wxAUI_NB_TAB_MOVE|wxAUI_NB_CLOSE_ON_ACTIVE_TAB|wxAUI_NB_TAB_FIXED_WIDTH|wxAUI_NB_WINDOWLIST_BUTTON);
                _tabsMgr = new wxTabPanelsManager(this);
                _frameAUIMgr->AddPane(_notebook,wxAuiPaneInfo().CenterPane());  
 

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
index b54d8ab202d94afdf2f0e6d46ed926066231eade..0945a49611e9e32a5d45009ebcb2201e6b2b2699 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.h
@@ -47,6 +47,7 @@
 #include "wxTabPanelsManager.h"
 #include "wxBlackBoxEditionDialog.h"
 #include "wxVtkSceneManager.h"
+#include "GlobalConstants.h"
 
 //#include "C:\RaC\CREATIS\bbtkGEditor\data\icons\wxart_new.xpm" // JPR
 #include "wxart_new.xpm" // JPR

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index 0fba89580e3036470a7aaf962e3a5a36cb6f57f1..4cfa95df5f445f23c3379582cb2023b7ecfc111a 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -39,6 +39,7 @@ Version:   $Revision$
 
 namespace bbtk
 {
+
        //=========================================================================
        wxGEditorTabPanel::wxGEditorTabPanel()
        {
@@ -50,7 +51,6 @@ namespace bbtk
                _id=id;
                _panelAUIMgr = new wxAuiManager(this);
                _sceneManager = NULL;
-
                initWxVtkCanvas();
        }
 
@@ -168,6 +168,13 @@ namespace bbtk
 
        //=========================================================================
 
+       int wxGEditorTabPanel::getPanelId()
+       {
+               return _id;
+       }
+
+       //=========================================================================
+
 }  // EO namespace bbtk
 
 // EOF

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
index ea7c4261e619c86872f092777198eeb6fcb977a0..c3a9a771ec3d0af6a9f893caddbd32bfbb1e4e78 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.h
@@ -88,6 +88,7 @@ namespace bbtk
                void centerView();
                void saveDiagram(std::string &content);
                void loadDiagram(ifstream &inputStream);
+               int getPanelId();
 
        //=========================================================================
                

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
index 7998bc4e64c7f8292c7f88605e744419a85e2f49..97fa011480421f0d31f0e5f11119b49694f60e8a 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
@@ -48,6 +48,7 @@ namespace bbtk
                _lastId = 0;
                _notebook = _parent->getAuiNotebook();
                addNewTab();
+               _notebook->Connect(wxEVT_COMMAND_AUINOTEBOOK_PAGE_CHANGED,wxAuiNotebookEventHandler(wxTabPanelsManager::OnTabChanged),0,this);
        }
 
        //=========================================================================
@@ -58,13 +59,11 @@ namespace bbtk
        //=========================================================================
        void wxTabPanelsManager::addNewTab()
        {
-               _lastId++;              
-
+               _lastId++;
                wxGEditorTabPanel *newPanel = new wxGEditorTabPanel(_notebook,_lastId);
                newPanel->setPanelsManager(this);
                _panels[_lastId]=newPanel;
                _actual = newPanel;
-
                _notebook->AddPage(newPanel,_T("Diagram"),true);
        }
 
@@ -145,6 +144,17 @@ namespace bbtk
 
        //=========================================================================
 
+       void wxTabPanelsManager::OnTabChanged(wxAuiNotebookEvent& event)
+       {
+               int index = event.GetSelection();
+               wxGEditorTabPanel* tab =(wxGEditorTabPanel*)_notebook->GetPage(index);          
+               int id = tab->getPanelId();
+               _actual = _panels[id];  
+       }
+
+       //=========================================================================
+
+
 }  // EO namespace bbtk
 
 // EOF

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h
index 42681b7e8270e38a2351a2c602eedfb6b9566441..3cdfcdeb33a1ea24eb81bcd9e090a4b9d9069bd3 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h
@@ -62,7 +62,7 @@ namespace bbtk
        class wxGEditorTabPanel;
        class wxGUIEditorGraphicBBS;
 
-       class wxTabPanelsManager
+       class wxTabPanelsManager : public wxEvtHandler
        {
        public: 
                wxTabPanelsManager(wxGUIEditorGraphicBBS *parent);
@@ -81,6 +81,8 @@ namespace bbtk
                void centerViewActualDiagram();
                void saveActualDiagram(std::string &content);
                void loadDiagram(ifstream &inputStream);
+               
+               void OnTabChanged(wxAuiNotebookEvent& event);
 
        private:
 
@@ -88,7 +90,7 @@ namespace bbtk
        ** The map 
        */
                wxGUIEditorGraphicBBS *_parent;
-               map<int, wxPanel*> _panels;
+               map<int, wxGEditorTabPanel*> _panels;
                wxGEditorTabPanel* _actual;
                wxAuiNotebook  *_notebook;
                int _lastId;