]> Creatis software - bbtkGEditor.git/blobdiff - lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxVtkSceneManager.cxx
some memory leaks
[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / wxVtkSceneManager.cxx
index cf08b262520bf5eab10e9d8293b4422794f0d762..3740f982be9afc20d9c3e585f6913dc7afae0a2f 100644 (file)
@@ -39,7 +39,6 @@ Version:   $Revision$
  #include <vtkPolygon.h>
  #include <vtkUnstructuredGrid.h>
 
-
 namespace bbtk
 {
 
@@ -47,6 +46,12 @@ namespace bbtk
        //=========================================================================
        wxVtkSceneManager::wxVtkSceneManager(wxGEditorTabPanel *parent, wxVtk3DBaseView *baseView,int idManager)
        {
+        _cbName         = "ComplexBoxName";
+        _cbPackageName  = "PackageName";
+        _Author       = "Author ??";
+        _Category     = "<VOID>";
+        _Description  = "Description ??";
+
                _parent                 = parent;
                _numBoxes               = 0;
                _idManager              = idManager;
@@ -85,14 +90,17 @@ namespace bbtk
 
        wxVtkSceneManager::~wxVtkSceneManager()
        {
+               //FCY memory leaks
                printf ("EED %p ~wxVtkSceneManager()\n" , this );
                disconnectDrop();
+               delete _baseView;
        }
 
        //=========================================================================
 
        void wxVtkSceneManager::configureBaseView()
        {
+printf("EED wxVtkSceneManager::configureBaseView 0\n");
                vtkInteractorStyleBaseView2D *interactorstylebaseview = vtkInteractorStyleBaseView2D::New();
 
                _baseView->SetInteractorStyleBaseView(interactorstylebaseview);
@@ -179,6 +187,7 @@ namespace bbtk
                _aPolygonMapper->Modified();
 
                _baseView->GetRenderer()->AddActor( _fillObjectActor );
+printf("EED wxVtkSceneManager::configureBaseView 1\n");
        }
 
        //=========================================================================
@@ -1253,6 +1262,28 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
             script+=LineNumber(wln,lnNmbr);
                        script+="\n";
 
+
+//ups2
+
+            script+=LineNumber(wln,lnNmbr);
+            script+="author \"";
+            script+=_Author;
+            script+="\"\n";
+
+            script+=LineNumber(wln,lnNmbr);
+            script+="description \"";
+            script+=_Description;
+            script+="\"\n";
+
+            script+=LineNumber(wln,lnNmbr);
+            script+="category \"";
+            script+=_Category;
+            script+="\"\n";
+
+            script+=LineNumber(wln,lnNmbr);
+            script+="\n";
+
+
                        // script+="include std\n"; // JPR
 
                        for(i = 0; i < (int)boxes.size();i++)
@@ -1339,9 +1370,8 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 
        //=========================================================================
 
-       std::string wxVtkSceneManager::saveComplexBoxBBS(std::string cbName,std::string paName,std::string cbAuthor,std::string cbCategory,std::string cbDescription)
+       std::string wxVtkSceneManager::saveComplexBoxBBS()
        {
-
                std::vector<std::string> packages;
                std::vector<int> boxes;
                std::vector<int> connections;
@@ -1398,21 +1428,28 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
                }
                script+="\n";
 
+
                // Definition of a complex box
                script+="define ";
-               script+=cbName+" "+paName;
+               script+=_cbName+" "+_cbPackageName;
                script+="\n";
                script+="\n";
 
-               script+="author \" ";
-               script+=cbAuthor;
+               script+="author \"";
+               script+=_Author;
                script+="\"\n";
 
-               script+="description \" ";
-               script+=cbDescription;
+               script+="description \"";
+               script+=_Description;
                script+="\"\n";
                script+="\n";
 
+               script+="category \"";
+               script+=_Category;
+               script+="\"\n";
+               script+="\n";
+
+
                // Create boxes
                for(i = 0; i<(int)boxes.size();i++)
                {
@@ -1589,11 +1626,32 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
        {
                char buffer [50];
 
+        content+="CATEGORY:";
+        content+=GetCategory();
+        content+="\n";
+
+        content+="DESCRIPTION:";
+        content+=GetDescription();
+        content+="\n";
+
+        content+="AUTHOR:";
+        content+=GetAuthor();
+        content+="\n";
+
+
                //Print info IF COMPLEX BOX
                content+="COMPLEXBOX:";
                if(_isComplexBox)
                {
                        content+="TRUE\n";
+//ups1
+                       content+="COMPLEXBOXNAME:";
+            content+=GetCbName();
+                       content+="\n";
+
+                       content+="PACKAGENAME:";
+            content+=GetCbPackageName();
+                       content+="\n";
 
                        //Print info complex input ports
                        std::vector<int> inputs = getComplexInputPorts();
@@ -1667,7 +1725,7 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
        void wxVtkSceneManager::loadDiagram(ifstream &inputStream)
        {
 
-               std::string version;
+               std::string version="<void>";
                std::string line="";
                char delims[] = ":";
                char *result = NULL;
@@ -1682,9 +1740,15 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
                                if (line=="# - BBTKGEditor v 1.0 BBG BlackBox Diagram file")
                                {
                                        version=line.substr(18,3);
-                                       printf("EED wxVtkSceneManager::loadDiagram  version=%s\n",version.c_str());
                                }
-
+                               if (line=="# - BBTKGEditor v 1.1 BBG BlackBox Diagram file")
+                               {
+                                       version=line.substr(18,3);
+                               }
+                               if (line=="# - BBTKGEditor v 1.2 BBG BlackBox Diagram file")
+                               {
+                                       version=line.substr(18,3);
+                               }
                        }
                        else if(line=="APP_START")
                        {
@@ -1693,14 +1757,40 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
                        }
                }
 
+        printf("EED wxVtkSceneManager::loadDiagram  version=%s\n",version.c_str());
+
                if(start)
                {
 
+            if ((version!="1.0") && (version!="1.1"))
+            {
+                               getline(inputStream,line);//CATEGORY:<category of the box>
+                char categoryTmp[30];
+                strcpy( categoryTmp, line.c_str() );
+                result = strtok( categoryTmp, delims );
+                result = strtok( NULL, delims );
+                SetCategory(result);
+
+                               getline(inputStream,line);//DESCRIPTION:<description of the box>
+                char descriptionTmp[1024];
+                strcpy( descriptionTmp, line.c_str() );
+                result = strtok( descriptionTmp, delims );
+                result = strtok( NULL, delims );
+                SetDescription(result);
+
+                               getline(inputStream,line);//AUTHOR:<author>
+                char authorTmp[255];
+                strcpy( authorTmp, line.c_str() );
+                result = strtok( authorTmp, delims );
+                result = strtok( NULL, delims );
+                SetAuthor(result);
+            }
+
                        //----------
                        getline(inputStream,line);//COMPLEX_BOX:TRUE|FALSE
-                       char complex[30];
-                       strcpy( complex, line.c_str() );
-                       result = strtok( complex, delims );
+                       char complexTmp[30];
+                       strcpy( complexTmp, line.c_str() );
+                       result = strtok( complexTmp, delims );
                        result = strtok( NULL, delims );
                        std::string isComplexBox(result);
 
@@ -1708,6 +1798,24 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
                        {
                                _isComplexBox=true;
 
+                if ((version!="1.0") && (version!="1.1"))
+                {
+                    getline(inputStream,line);//COMPLEXNAME:<name of the complex box>
+                    char complexboxnameTmp[255];
+                    strcpy( complexboxnameTmp, line.c_str() );
+                    result = strtok( complexboxnameTmp, delims );
+                    result = strtok( NULL, delims );
+                    SetCbName(result);
+
+                    getline(inputStream,line);//PACKAGENAME:<name of the package of the box>
+                    char packagenameTmp[255];
+                    strcpy( packagenameTmp, line.c_str() );
+                    result = strtok( packagenameTmp, delims );
+                    result = strtok( NULL, delims );
+                    SetCbPackageName(result);
+                }
+
+
                                //-----------------------
                                //- COMPLEX INPUT PORTS
                                //-----------------------
@@ -2428,33 +2536,93 @@ printf("EED  wxVtkSceneManager::createGComplexBoxOutputPort 900-450\n");
 
 
        //=========================================================================
-    void wxVtkSceneManager::SetComplexBoxName(std::string cbName)
+    void wxVtkSceneManager::SetCbName(std::string cbName)
+    {
+        _cbName=cbName;
+        if (_cbName=="")
+        {
+            _cbName="<complex box name>";
+        }
+    }
+
+       //=========================================================================
+    std::string wxVtkSceneManager::GetCbName()
+    {
+        return _cbName;
+    }
+
+       //=========================================================================
+    void wxVtkSceneManager::SetCbPackageName(std::string packagename)
+    {
+        _cbPackageName=packagename;
+        if (_cbPackageName=="")
+        {
+            _cbPackageName="<package name of the complex box>";
+        }
+    }
+
+       //=========================================================================
+    std::string wxVtkSceneManager::GetCbPackageName()
+    {
+        return _cbPackageName;
+    }
+
+       //=========================================================================
+    void wxVtkSceneManager::SetAuthor(std::string author)
+    {
+        _Author=author;
+        if (_Author=="")
+        {
+            _Author="<author of the box>";
+        }
+    }
+
+       //=========================================================================
+    std::string wxVtkSceneManager::GetAuthor()
     {
-        _complexBoxName=cbName;
+        return _Author;
     }
 
        //=========================================================================
-    std::string wxVtkSceneManager::GetComplexBoxName()
+    void wxVtkSceneManager::SetCategory(std::string category)
     {
-        return _complexBoxName;
+        _Category=category;
+        if (_Category=="")
+        {
+            _Category="<category of the box>";
+        }
     }
 
+       //=========================================================================
+    std::string wxVtkSceneManager::GetCategory()
+    {
+        return _Category;
+    }
 
        //=========================================================================
-    void wxVtkSceneManager::SetPackageName(std::string paName)
+    void wxVtkSceneManager::SetDescription(std::string description)
     {
-        _packageName=paName;
+        _Description=description;
+        if (_Description=="")
+        {
+            _Description="<description of the box>";
+        }
     }
 
        //=========================================================================
-    std::string wxVtkSceneManager::GetPackageName()
+    std::string wxVtkSceneManager::GetDescription()
     {
-        return _packageName;
+        return _Description;
     }
 
        //=========================================================================
 
 
+
+
+
+
+
 }  // EO namespace bbtk
 
 // EOF