no message

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

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 0b97c8d07c933d3dcc6740989f4615531f33fc4c..75b6c259d9ba05aa15ee12ee9978bdf46101c223 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -35,6 +35,11 @@ Version:   $Revision$
 
 #include "bbtkwxGUIEditorGraphicBBS.h"
 #include "creaWx.h"
+#include "creaSystem.h"
+
+#include <InterpreterBBS.h>
+
+
 
 namespace bbtk
 {
@@ -45,8 +50,6 @@ namespace bbtk
                : wxFrame(parent, -1, _T("bbtkGEditor"),wxDefaultPosition, wxSize(1200,800))
        {
 
-               printf ("EED %p wxGUIEditorGraphicBBS()\n" , this );
-
                _frameAUIMgr = new wxAuiManager(this);
                
 
@@ -101,6 +104,7 @@ namespace bbtk
                wxBitmap bmp_run(run_xpm);
                wxBitmap bmp_delete(delete_xpm);
                wxBitmap bmp_centerview(centerview_xpm);
+               wxBitmap bmp_box(box_xpm);
                wxBitmap bmp_complexbox(complexbox_xpm);
                wxBitmap bmp_complexinputport(complexinputport_xpm);
                wxBitmap bmp_complexoutputport(complexoutputport_xpm);
@@ -115,6 +119,8 @@ namespace bbtk
                toolbar->AddTool(ID_DELETEALL,_T("Delete all"),bmp_delete, wxNullBitmap, wxITEM_NORMAL,_T("Delete all boxes"), _T("Delete all boxes"));
                toolbar->AddTool(ID_CENTERVIEW,_T("Center view"),bmp_centerview, wxNullBitmap, wxITEM_NORMAL,_T("Center view"), _T("Center view"));
                toolbar->AddSeparator();
+               toolbar->AddTool(ID_BTNBOX,_T("New Box"),bmp_box, wxNullBitmap, wxITEM_NORMAL,_T("New Box"), _T("Nex Box"));
+               toolbar->AddSeparator();
                toolbar->AddTool(ID_BTNCOMPLEXBOX,_T("Complex box"),complexbox_xpm, wxNullBitmap, wxITEM_NORMAL,_T("Complex box"), _T("Complex box"));
                toolbar->SetToggle(ID_BTNCOMPLEXBOX,true);
                toolbar->AddTool(ID_ADDCOMPLEXBOXINPUT,_T("Add input to Complex box"),bmp_complexinputport, wxNullBitmap, wxITEM_NORMAL,_T("Add input to Complex box"), _T("Add input to Complex box"));
@@ -133,6 +139,7 @@ namespace bbtk
                Connect(ID_RUN,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnExecuteActualDiagram));
                Connect(ID_DELETEALL,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnDeleteAllBoxesActualDiagram));
                Connect(ID_CENTERVIEW,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCenterViewActualDiagram));
+               Connect(ID_BTNBOX,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnClickBtnBox));
                Connect(ID_BTNCOMPLEXBOX,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnClickBtnComplexBox));
                Connect(ID_ADDCOMPLEXBOXINPUT,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnAddComplexBoxInput));
                Connect(ID_ADDCOMPLEXBOXOUTPUT,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnAddComplexBoxOutput));
@@ -154,12 +161,14 @@ namespace bbtk
                wxMenu *fileMenu = new wxMenu();
                fileMenu->Append(ID_NEW, _T("New diagram"), _T("New"));
                fileMenu->Append(ID_SAVE_AS_DIAGRAM, _T("Save diagram"), _T("Save diagram"));
+               fileMenu->Append(ID_OPEN_BBS, _T("Open BBS"), _T("Open BBS"));
                fileMenu->Append(ID_SAVE_AS_BBS, _T("Save BBS"), _T("Save BBS"));
                fileMenu->Append(ID_SAVE_AS_COMPLEXBOX, _T("Save complex box"), _T("Save complex box"));
                fileMenu->Append(wxID_EXIT, _T("E&xit"), _T("Exit"));
 
                Connect(ID_NEW,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreateNewTab));
                Connect(ID_SAVE_AS_DIAGRAM,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveActualDiagram));
+               Connect(ID_OPEN_BBS,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnOpenBBS));
                Connect(ID_SAVE_AS_BBS,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveActualBBS));
                Connect(ID_SAVE_AS_COMPLEXBOX,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveActualComplexBox));
                Connect(wxID_EXIT,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnExit));
@@ -345,26 +354,34 @@ namespace bbtk
                tempFile.open(filename.c_str());
                tempFile << script;
                tempFile.close();
-               
-               std::string command = "\"";
 
+               std::string command = "\""+ crea::System::GetExecutablePath();
+
+               
+#ifdef MACOSX
+               command += separator + "../../../bbi.app/Contents/MacOS";
+#endif
+               
                #ifdef WIN32
                        command += "\"";
                #endif
-
+               
+               /*              
+               
                //command += ConfigurationFile::GetInstance().Get_bin_path();
 //EED          command +="C:/temp/bbtkBIN/RelWithDebInfo//";
 //EED          command +="C:/Program Files/CreaTools/bbtk-0.9.5/bin";
-               command +=".";
 
 
                #ifdef MACOSX
-                       command += separator + "bbi.app/Contents/MacOS/bbi\" ";
+                       command += separator + "usr/local/bin/bbi.app/Contents/MacOS/bbi\" ";
                #else 
+                   command +=".";
                        command += separator + "bbi\" ";
                #endif
+ */
+               command += separator + "bbi\" ";
                command += "\""+filename + "\"";
-
                #ifdef WIN32
                        command += "\"";
                #endif
@@ -396,16 +413,36 @@ namespace bbtk
                executeScript(script);          
        }
 
+       
        //=========================================================================
        // HANDLERS 
        //=========================================================================
+       void wxGUIEditorGraphicBBS::OnOpenBBS(wxCommandEvent& event)
+       {
+               wxFileDialog * openFileDialog = new wxFileDialog(this,wxT("Open BBS"),wxEmptyString,wxT("NewBBS"),wxT("*.bbs"),wxOPEN);
+               if (openFileDialog->ShowModal() == wxID_OK)
+               {
+                       wxString fileName = openFileDialog->GetPath(  );
+                       
+                       
+                       _tabsMgr->addNewTab();
+
+                       bbtk::InterpreterBBS::Pointer I = bbtk::InterpreterBBS::New( this->_tabsMgr->getActualTabPanel()->getSceneManager() , _pkgBrowser->GetFactory());                       
+                       
+                       // We tell the interpreter to throw exceptions on error
+                       I->SetThrow(true);
+                       // Interpret the file supposed to define a box called 'Processing'
+                       I->InterpretFile( (const char*) (fileName.mb_str()) );
+               }
+               refreshGUIControls();
+       }
 
        void wxGUIEditorGraphicBBS::OnSaveActualBBS(wxCommandEvent& event)
        {
                wxFileDialog * saveFileDialog = new wxFileDialog(this,wxT("Save  actual BBS"),wxEmptyString,wxT("NewBBS"),wxT("*.bbs"),wxSAVE|wxOVERWRITE_PROMPT);
                if (saveFileDialog->ShowModal() == wxID_OK)
                {
-                       wxString fileName = saveFileDialog->GetPath();
+                       wxString fileName = saveFileDialog->GetPath(  );
                        
                        ofstream file;
 
@@ -435,7 +472,6 @@ namespace bbtk
                if (nameDialog->ShowModal() == wxID_OK)
                {
                        wxString fileName = nameDialog->GetValue();
-//EED                  cbName=fileName;
                        cbName=(const char*) (fileName.mb_str());
                }               
 
@@ -447,7 +483,6 @@ namespace bbtk
                                wxString fileName = saveFileDialog->GetPath();
                                
                                ofstream file;
-//EED                          file.open(fileName.c_str());
                                file.open( (const char*) (fileName.mb_str()) );
 
                                std::string content="";
@@ -475,7 +510,6 @@ namespace bbtk
                        wxString fileName = saveFileDialog->GetPath();
                        
                        ofstream file;
-//EED                  file.open(fileName.c_str());
                        file.open( (const char*) (fileName.mb_str()) );
 
                        std::string content="";
@@ -485,7 +519,6 @@ namespace bbtk
                        content += "# - BBTKGEditor v 1.0 BBG BlackBox Diagram file\n";
                        content += "# - ";
 
-//EED                  content += fileName;
                        content += (const char*) (fileName.mb_str());
 
                        content += "\n";
@@ -580,7 +613,23 @@ namespace bbtk
        }
 
        //=========================================================================
+       
+       
+       void wxGUIEditorGraphicBBS::OnClickBtnBox(wxCommandEvent& event)
+       {
+               BlackBoxDescriptor      *bbDes          = _pkgBrowser->GetActualSelected();
+               std::string                     typeName        = bbDes->GetTypeName();
+               std::string                     packageName = bbDes->GetPackage()->GetName();
+
+               this->_tabsMgr->getActualTabPanel()->getSceneManager()->createGBlackBox(50,50,packageName, typeName);
+               this->_tabsMgr->getActualTabPanel()->getSceneManager()->refresh();
+               
+               printf("EED  wxGUIEditorGraphicBBS::OnClickBtnBox \n");
+       }
+       
+       //=========================================================================
 
+       
        void wxGUIEditorGraphicBBS::OnClickBtnComplexBox(wxCommandEvent& event)
        {
                wxToolBar* toolbar = GetToolBar();