Bug #1760

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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index b37e67d4b6b35cf0c13f3d04dd7c9b1d8485008e..dd4adcb5001a5590fcc3bcc29b2b02f46922b29d 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -47,41 +47,36 @@ 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();
-               _sactualdo = sstates.begin();
+               _panelAUIMgr    = new wxAuiManager(this);
+               _sceneManager   = NULL;
+               _actualdo               = states.begin();
+               _sactualdo              = sstates.begin();
+               _bbtkfactory    = bbtkfactory;
                initWxVtkCanvas();
-printf("EED wxGEditorTabPanel::wxGEditorTabPanel 1\n");
        }
 
        //=========================================================================
        wxGEditorTabPanel::~wxGEditorTabPanel()
        {
-printf ("EED %p ~wxGEditorTabPanel() START \n" , this );
 //ED02JUIN2010         _sceneManager->disconnectDrop();
 
         _panelsManager->VerifyLastTabPanel();
                //FCY memory leaks
                delete _panelAUIMgr;
                delete _sceneManager;
-
-               printf ("EED %p ~wxGEditorTabPanel() END\n" , this );
-
        }
 
        //=========================================================================
        void wxGEditorTabPanel::initWxVtkCanvas()
        {
-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
@@ -89,7 +84,6 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 0\n");
                _panelAUIMgr->AddPane((wxWindow*)baseview->GetWxVTKRenderWindowInteractor(),wxAuiPaneInfo().Fixed().CenterPane());
 
                _panelAUIMgr->Update();
-printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
        }
 
        //=========================================================================
@@ -111,8 +105,11 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
                 result = strtok( NULL, delims );
                 boxType += result;
 
-               _sceneManager->createGBlackBox(x,y,packageName, boxType);
-               saveTempandUpdate("drop box");
+               if ( _panelsManager->TryToOpenScriptApplication(packageName,boxType) == false )
+               {
+                       _sceneManager->createGBlackBox(x,y,packageName, boxType);
+                       saveTempandUpdate("drop box");
+               }               
          return true;
        }
 
@@ -195,7 +192,7 @@ printf("EED wxGEditorTabPanel::initWxVtkCanvas 1\n");
                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";