Bug #1688 RaC 2012 Bug to avoid opening twice the same diagram. Corrected and tested.

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / wxTabPanelsManager.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
index 14f85311b1bacc5f87e8e57b0a6c52b23827bb79..fe453d791a001df2bc4b3f8fa63364a276387727 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.cxx
@@ -60,17 +60,15 @@ namespace bbtk
        //=========================================================================
        void wxTabPanelsManager::addNewTab(wxString tabName)
        {
-printf("EED wxTabPanelsManager::addNewTab 0\n");
-
                _lastId++;
-               wxGEditorTabPanel *newPanel         = new wxGEditorTabPanel(_notebook,_lastId);
+
+               //EED 13/10/2012                wxGEditorTabPanel *newPanel         = new wxGEditorTabPanel( _notebook,_lastId );
+               wxGEditorTabPanel *newPanel         = new wxGEditorTabPanel( _notebook,_lastId, _parent->GetBBTKFactory() );
+
                newPanel->setPanelsManager(this);
                _panels[_lastId]                    = newPanel;
                _actual                             = newPanel;
-
                _notebook->AddPage(newPanel, tabName  ,true);
-
-printf("EED wxTabPanelsManager::addNewTab 1\n");
        }
 
 
@@ -151,10 +149,16 @@ printf("EED wxTabPanelsManager::addNewTab 1\n");
        {
                _actual->loadDiagram(inputStream, path);
        }
+
        //=========================================================================
-       void wxTabPanelsManager::saveTempActualDiagram() //FCY
+       void wxTabPanelsManager::saveTempandUpdate(const std::string &action) //FCY
        {
-               _actual->saveTempDiagram();
+               _parent->SaveTempActualDiagram(action);
+       }
+       //=========================================================================
+       void wxTabPanelsManager::saveTempActualDiagram(const std::string &action) //FCY
+       {
+               _actual->saveTempDiagram(action);
        }
        //=========================================================================
        void wxTabPanelsManager::loadTempDiagram(unsigned short un) //FCY
@@ -163,14 +167,14 @@ printf("EED wxTabPanelsManager::addNewTab 1\n");
        }
 
        //=========================================================================
-       unsigned short wxTabPanelsManager::getUndoState() //FCY
+       unsigned short wxTabPanelsManager::getUndoState( std::string &stun) //FCY
        {
-                return _actual->getUndoState();
+                return _actual->getUndoState(stun);
        }
                //=========================================================================
-       unsigned short wxTabPanelsManager::getRedoState() //FCY
+       unsigned short wxTabPanelsManager::getRedoState(std::string &stre) //FCY
        {
-                return _actual->getRedoState();
+                return _actual->getRedoState(stre);
        }
        //=========================================================================
 
@@ -301,6 +305,20 @@ printf("wxTabPanelsManager::VerifyActualTabPanel  %d \n", this->_notebook->GetPa
            //return ( (wxGEditorTabPanel) _notebook->GetPage(id)->GetFullPath( ) );
        }
 
+       //=========================================================================
+
+       int  wxTabPanelsManager::FindTab(std::string filename)
+       {
+               std::map<int, wxGEditorTabPanel*>::iterator it;
+               for (it = _panels.begin(); it != _panels.end(); ++it)
+               {
+                       wxGEditorTabPanel *obj = it->second;
+                       int id = it->first;
+                       if(obj->GetFullPath()==filename)
+                               return id;
+               }
+               return -1;
+       }
 
        //=========================================================================
     std::string wxTabPanelsManager::GetCbPackageName()