Bug #1689

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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index 682c1193ffecf282544166a111c9487815eac2db..00f669bc64f9c19a0c96d42d89934c5f7dea8a71 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -47,14 +47,17 @@ namespace bbtk
        }
 
        //=========================================================================
-       wxGEditorTabPanel::wxGEditorTabPanel(wxWindow *parent,int id):wxPanel(parent),wxTextDropTarget()
+       wxGEditorTabPanel::wxGEditorTabPanel(wxWindow *parent,int id, Factory::Pointer bbtkfactory)
+        : wxPanel(parent),wxTextDropTarget()
        {
 printf("EED wxGEditorTabPanel::wxGEditorTabPanel 0\n");
                printf ("EED %p wxGEditorTabPanel 2 ()\n" , this );
                _id=id;
-               _panelAUIMgr = new wxAuiManager(this);
-               _sceneManager = NULL;
-               _actualdo = states.begin();
+               _panelAUIMgr    = new wxAuiManager(this);
+               _sceneManager   = NULL;
+               _actualdo               = states.begin();
+               _sactualdo              = sstates.begin();
+               _bbtkfactory    = bbtkfactory;
                initWxVtkCanvas();
 printf("EED wxGEditorTabPanel::wxGEditorTabPanel 1\n");
        }
@@ -71,7 +74,6 @@ printf ("EED %p ~wxGEditorTabPanel() START \n" , this );
                delete _sceneManager;
 
                printf ("EED %p ~wxGEditorTabPanel() END\n" , this );
-
        }
 
        //=========================================================================
@@ -80,7 +82,8 @@ printf ("EED %p ~wxGEditorTabPanel() START \n" , this );
 printf("EED wxGEditorTabPanel::initWxVtkCanvas 0\n");
                wxVtk3DBaseView *baseview = new wxVtk3DBaseView(this);
                baseview->Configure();
-               _sceneManager=new wxVtkSceneManager(this,baseview,_id);
+//EED 15 oct 2012              _sceneManager=new wxVtkSceneManager(this,baseview,_id);
+               _sceneManager=new wxVtkSceneManager(this,baseview,_id, _bbtkfactory);
 
 
 //EED02JUIN2010
@@ -111,10 +114,15 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
                 boxType += result;
 
                _sceneManager->createGBlackBox(x,y,packageName, boxType);
-
+               saveTempandUpdate("drop box");
          return true;
        }
 
+       //=========================================================================
+       void wxGEditorTabPanel::saveTempandUpdate(const std::string &action)
+       {
+               _panelsManager->saveTempandUpdate(action);
+       }
        //=========================================================================
 
        void wxGEditorTabPanel::setPanelsManager(wxTabPanelsManager* panelsManager)
@@ -184,12 +192,12 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
 
        //=========================================================================
 
-       void wxGEditorTabPanel::saveTempDiagram() //FCY
+       void wxGEditorTabPanel::saveTempDiagram(const std::string &action) //FCY
        {
                std::string content = "";
                // writing file header
                content += "# ----------------------------------\n";
-               content += "# - BBTKGEditor v 1.2 BBG BlackBox Diagram file\n";
+               content += "# - BBTKGEditor v 1.3 BBG BlackBox Diagram file\n";
                content += "# - ";
                content += "temp";
                content += "\n";
@@ -201,14 +209,20 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
                if(_actualdo == states.end() ) // same size, write to the end
                {
                        states.push_back (content);
+                       saveStringAction(action);
                }
                else
                {
                        std::vector<std::string>::iterator it = _actualdo+1;
                        states.erase(it, states.end());
                        states.push_back(content);
+
+                       std::vector<std::string>::iterator sit = _sactualdo+1;
+                       sstates.erase(sit, sstates.end());
+                       saveStringAction(action);
                }
                _actualdo = states.end();
+               _sactualdo = sstates.end();
                        
        }
 
@@ -223,25 +237,40 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
        }
 
        //=========================================================================
-       unsigned short wxGEditorTabPanel::getUndoState()
+       unsigned short wxGEditorTabPanel::getUndoState( std::string &stun)
        {
+               stun = "Undo";
                if(states.size()>0)
                {
                        if(_actualdo == states.begin() )
+                       {
+                               
                                return 0;
+                       }
                        else
+                       {
+                               stun +=" - ";
+                               stun += _sactualdo->substr(0,(--_sactualdo)->find_last_of("."));
+                               _sactualdo++;
                                return 1;
+                       }
                }
        }
 
-       unsigned short wxGEditorTabPanel::getRedoState()
+       unsigned short wxGEditorTabPanel::getRedoState( std::string &stre)
        {
+               stre = "Redo";
                if(states.size()>0)
                {
-                       if(_actualdo == --states.end() || states.size() == 1)
+                       if(_actualdo == --states.end() || states.size() == 1 || _actualdo == states.end())
                                return 0;
                        else
+                       {
+                               stre +=" - ";
+                               stre += _sactualdo->substr(0,(++_sactualdo)->find_last_of("."));
+                               --_sactualdo;
                                return 1;
+                       }
                }
        }
 
@@ -256,10 +285,12 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
                        if(_actualdo == states.end() ) // same size, write to the end
                        {
                                (_actualdo--);
+                               (_sactualdo--);
                        }
                        if(_actualdo != states.begin() )
                        {
                                ss << *(--_actualdo);
+                               _sactualdo--;
                        }
                        else
                        {
@@ -270,6 +301,7 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
                else //redo
                {
                        _actualdo++;
+                       _sactualdo++;
                        if(_actualdo != states.end())
                        {
                                ss << *_actualdo;
@@ -282,13 +314,22 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
                _sceneManager->loadDiagram(ss);
        
        }
-       
+
+       void wxGEditorTabPanel::saveStringAction(const std::string &action)
+       {
+               char temp[50];
+               sprintf(temp,".%d", sstates.size());
+               sstates.push_back(action + temp);
+       }
+
        //=========================================================================
 
        int wxGEditorTabPanel::getPanelId()
        {
                return _id;
        }
+       
+
 
        //=========================================================================