This commit was manufactured by cvs2svn to create tag 'CREATOOLS_2-0-3'.

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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 7addacf59c6dcee36929bfb443724a19933733fe..f3f6a04d7e6e8624a984ff3240e38ea3541f9940 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -428,7 +428,7 @@ namespace bbtk
                        wxString fileName = openFileDialog->GetPath(  );
 
 
-                       _tabsMgr->addNewTab(  openFileDialog->GetFilename()  );
+                       _tabsMgr->addNewTab();
 
                        bbtk::InterpreterBBS::Pointer I = bbtk::InterpreterBBS::New( this->_tabsMgr->getActualTabPanel()->getSceneManager() , _pkgBrowser->GetFactory());
 
@@ -451,7 +451,7 @@ namespace bbtk
         std::string content="";
         // writing file header
         content += "# ----------------------------------\n";
-        content += "# - BBTKGEditor v 1.2 BBS BlackBox Script\n";
+        content += "# - BBTKGEditor v 1.1 BBS BlackBox Script\n";
         content += "# - ";
         content += filename;
         content += "\n";
@@ -475,54 +475,40 @@ namespace bbtk
        }
 
 
-    void wxGUIEditorGraphicBBS::AskComplexBoxConfiguration()
-    {
-               std::string cbName = _tabsMgr->GetCbName();
-               std::string paName = _tabsMgr->GetCbPackageName();
-
-               wxTextEntryDialog *cbNameDialog = new wxTextEntryDialog(this,wxT("Complex Box name"));
-               wxTextEntryDialog *paNameDialog = new wxTextEntryDialog(this,wxT("Package name"));
-
-               cbNameDialog->SetValue( wxString(cbName.c_str(),wxConvUTF8) );
-               paNameDialog->SetValue( wxString(paName.c_str(),wxConvUTF8) );
+       //=========================================================================
 
-               if (cbNameDialog->ShowModal() == wxID_OK)
+       void wxGUIEditorGraphicBBS::SaveActualComplexBox(std::string filename)
+       {
+               wxTextEntryDialog *nameDialog = new wxTextEntryDialog(this,wxT("Name of complex box"));
+               std::string cbName="";
+               if (nameDialog->ShowModal() == wxID_OK)
                {
-                       wxString complexboxname = cbNameDialog->GetValue();
+                       wxString complexboxname = nameDialog->GetValue();
                        cbName=(const char*) (complexboxname.mb_str());
                }
 
-
-               if (paNameDialog->ShowModal() == wxID_OK)
+               if(!cbName.empty())
                {
-                       wxString packagename = paNameDialog->GetValue();
-                       paName=(const char*) (packagename.mb_str());
-               }
 
-        _tabsMgr->SetCbName(cbName);
-        _tabsMgr->SetCbPackageName(paName);
-    }
-
-       //=========================================================================
-
-       void wxGUIEditorGraphicBBS::SaveActualComplexBox(std::string filename)
-       {
-        ofstream file;
-        file.open( filename.c_str() );
+                               ofstream file;
+                               file.open( filename.c_str() );
+
+                               std::string content="";
+
+                               // writing file header
+                               content += "# ----------------------------------\n";
+                               content += "# - BBTKGEditor v 1.1 BBS BlackBox Script (Complex Box)\n";
+                content += "# - ";
+                content += filename;
+                content += "\n";
+                               content += "# ----------------------------------\n";
+                               content += "\n";
+                               content += _tabsMgr->getActualComplexBoxBBS(cbName);
+                               file << content;
+                               file.close();
+               }
 
-        std::string content="";
 
-        // writing file header
-        content += "# ----------------------------------\n";
-        content += "# - BBTKGEditor v 1.2 BBS BlackBox Script (Complex Box)\n";
-        content += "# - ";
-        content += filename;
-        content += "\n";
-        content += "# ----------------------------------\n";
-        content += "\n";
-        content += _tabsMgr->getActualComplexBoxBBS();
-        file << content;
-        file.close();
        }
 
        //=========================================================================
@@ -547,7 +533,7 @@ namespace bbtk
 
         // writing file header
         content += "# ----------------------------------\n";
-        content += "# - BBTKGEditor v 1.2 BBG BlackBox Diagram file\n";
+        content += "# - BBTKGEditor v 1.1 BBG BlackBox Diagram file\n";
         content += "# - ";
 
         content += filename;
@@ -569,21 +555,16 @@ namespace bbtk
                wxFileDialog * saveFileDialog = new wxFileDialog(this,wxT("Save  actual diagram"),wxEmptyString,wxT("NewDiagram"),wxT("*.bbg"),wxSAVE|wxOVERWRITE_PROMPT);
                if (saveFileDialog->ShowModal() == wxID_OK)
                {
-            _tabsMgr->SetNameTabPanel( saveFileDialog->GetFilename() );
-
-                       wxString pathfileName       = saveFileDialog->GetPath();
-                       std::string pathfilename    = (const char*) (pathfileName.mb_str());
-            std::string pathfilenamebbs = pathfilename;
-            pathfilenamebbs[pathfilenamebbs.length()-1]='s';
+                       wxString fileName       = saveFileDialog->GetPath();
+                       std::string filename    = (const char*) (fileName.mb_str());
+            std::string filenamebbs = filename+"s";
 
+            SaveActualDiagram( filename );
             if (_tabsMgr->isActualDiagramComplexBox()==false)
             {
-                SaveActualDiagram( pathfilename );
-                SaveActualBBS(pathfilenamebbs);
+                SaveActualBBS(filenamebbs);
             } else {
-                AskComplexBoxConfiguration();
-                SaveActualDiagram( pathfilename );
-                SaveActualComplexBox(pathfilenamebbs);
+                SaveActualComplexBox(filenamebbs);
             } //if isActualDiagramComplexBox
                } // if saveFileDialog
        }
@@ -651,10 +632,9 @@ namespace bbtk
                {
                        wxString fileName = openFileDialog->GetPath();
                        ifstream inputStream;
-                       std::string fName=(const char*) (fileName.mb_str());
-                       inputStream.open( fName.c_str() );
-                       _tabsMgr->addNewTab( openFileDialog->GetFilename() );
-
+//EED                  inputStream.open(fileName.c_str());
+                       inputStream.open( (const char*) (fileName.mb_str()) );
+                       _tabsMgr->addNewTab();
                        _tabsMgr->loadDiagram(inputStream);
 
                        inputStream.close();