*** empty log message ***

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
index 1002c606018538aa837eeec8f3227a4f1f99c7e9..41602b8bfc7fe709238739c2beed6869c8d0ebef 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxGEditorTabPanel.cxx
@@ -135,7 +135,7 @@ printf ("EED %p ~wxGEditorTabPanel()\n" , this );
 
        //=========================================================================
 
-       std::string wxGEditorTabPanel::saveComplexBoxBBS(std::string cbName, std:string paName,std::string cbAuthor,std::string cbCategory,std::string cbDescription)
+       std::string wxGEditorTabPanel::saveComplexBoxBBS(std::string cbName, std::string paName,std::string cbAuthor,std::string cbCategory,std::string cbDescription)
        {
                return _sceneManager->saveComplexBoxBBS(cbName,paName,cbAuthor,cbCategory,cbDescription);
        }

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h
index 67e4d3a062df956caf9b5c97a31f54efbabbfc91..028a14495655d229f7731f57c1dda7ca99079f43 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxTabPanelsManager.h
@@ -79,7 +79,7 @@ namespace bbtk
                void updateStatusBar(std::string textStatus);
 
                std::string getActualDiagramBBS(bool wln=false);
-               std::string getActualComplexBoxBBS(std::string cbName, std::string std::string paName,std::string cbAuthor="",std::string cbCategory="",std::string cbDescription="");
+               std::string getActualComplexBoxBBS(std::string cbName,std::string paName,std::string cbAuthor="",std::string cbCategory="",std::string cbDescription="");
 
                void editBlackBox(GBlackBoxModel *bbmodel);
                void deleteAllBoxesActualDiagram();

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
index 5b409fe573c2c3054b58e0feb1b1009a9ca30e21..cf08b262520bf5eab10e9d8293b4422794f0d762 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
@@ -830,17 +830,17 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
                        } // isOverPort
 
                } else {  //_worldState
-                       
+
                        _worldState                             = DRAG_OBJECTS;
                        _startDragging                  = true;
-                       
+
                        int shiftkey            = _vtkInteractorStyleBaseView->GetInteractor()->GetShiftKey();
                        int ctrlkey             = _vtkInteractorStyleBaseView->GetInteractor()->GetControlKey();
                        ctrlkey = ctrlkey + shiftkey;
-                       
+
                        GObjectController *cont = GetGBlackBoxControlerPointedByMouse();
 
-                       
+
                        if (GetGBlackBoxControlerPointedByMouse()!=NULL)
                        {
                                int state=cont->getView()->getState() ;
@@ -859,7 +859,7 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 
                } // if _selectedObjects.size
 
-               
+
                return true;
        }
 
@@ -889,12 +889,12 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
                {
                        _worldState=NOTHING_HAPPENS;
                        //int lastId = _controllers.size()-1;
-                       
+
                        GConnectorController *connector = (GConnectorController*)_controllers[_idConnectionInCreation];
                        connector->removeFromScene();
                        unregisterController(connector);
                        _controllers.erase(_idConnectionInCreation);
-                       
+
                        std::map<int, GObjectController*>::iterator it;
                        for(it = _controllers.begin(); it != _controllers.end(); ++it)
                        {
@@ -903,10 +903,10 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
                                desc->getView()->setState(NOTHING_HAPPENS);
                                desc->getModel()->notifyObservers(_idManager);
                        } // for
-               }// if          
+               }// if
        }
-       
-       
+
+
        //=========================================================================
 
        bool wxVtkSceneManager::OnRightButtonUp()
@@ -1937,29 +1937,29 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
                                std::string nameEndPort(result);
 
                                int idCon = configGConnetion(nameStartBox, nameStartPort, nameEndBox, nameEndPort);
-                               
+
                                if (version!="1.0")
                                {
-                                       //Readding control points of the manualContour 
+                                       //Readding control points of the manualContour
                                        //ups1
-                                       GConnectorController    *tempp  = (GConnectorController*)_controllers[idCon];                           
+                                       GConnectorController    *tempp  = (GConnectorController*)_controllers[idCon];
                                        GConnectorModel                 *conMod = (GConnectorModel*)tempp->getModel();
                                        vtkGConnectorView               *conView= (vtkGConnectorView*)tempp->getView();
                                        getline(inputStream,line); //NumberOfControlPoints:##
                                        strcpy( conns, line.c_str() );
                                        result = strtok( conns, delims );
                                        result = strtok( NULL, delims );
-                               
+
                                        int numberOfControlPoints;
                                        std::istringstream isCons(result);
                                        isCons >> numberOfControlPoints;
-                               
+
                                        for (int ii=0;ii<numberOfControlPoints;ii++)
                                        {
                                                getline(inputStream,line); //XX:YY:ZZ
                                                char connec[200];
                                                strcpy( connec, line.c_str() );
-                                       
+
                                                double px,py,pz;
                                                result = strtok( connec, delims );
                                                std::istringstream isPointX(result);
@@ -1970,16 +1970,16 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
                                                result = strtok( NULL, delims );
                                                std::istringstream isPointZ(result);
                                                isPointZ >> pz;
-                                       
+
                                                conMod->getManualContourModel()->InsertPoint_id(ii+1,px,py,pz);
                                                conView->getManualContourView()->AddPoint();
                                        }
                                }// version !=1.0
-                               
+
                        } // for numConns
 
         } // start
-               
+
                refresh();
        }
        //=========================================================================
@@ -2426,7 +2426,34 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 
        }
 
+
        //=========================================================================
+    void wxVtkSceneManager::SetComplexBoxName(std::string cbName)
+    {
+        _complexBoxName=cbName;
+    }
+
+       //=========================================================================
+    std::string wxVtkSceneManager::GetComplexBoxName()
+    {
+        return _complexBoxName;
+    }
+
+
+       //=========================================================================
+    void wxVtkSceneManager::SetPackageName(std::string paName)
+    {
+        _packageName=paName;
+    }
+
+       //=========================================================================
+    std::string wxVtkSceneManager::GetPackageName()
+    {
+        return _packageName;
+    }
+
+       //=========================================================================
+
 
 }  // EO namespace bbtk
 

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
index 72dbe14bea55326d77210d832bf99770aa7006e5..8924e50fba4169e4980821ac289bbdede5e18443 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.h
@@ -190,9 +190,16 @@ namespace bbtk
                std::string findANewNameForABox();
                //-------
 
+        void SetComplexBoxName(std::string cbName);
+        void SetPackageName(std::string paName);
+        std::string GetComplexBoxName();
+        std::string GetPackageName();
 
        private:
 
+        std::string                         _complexBoxName;
+        std::string                         _packageName;
+
                //wxPanel that uses the manager
                wxGEditorTabPanel                                       *_parent;