X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=f5027edffc143c987cdaec8fc42480bb09f3fe8e;hb=5df801578dbf375c6f9f548ac94050a929e9346d;hp=2d4ea9e632ea86e52cc924d02f51183c344a716d;hpb=343ecf790a799b8089a6d13fec0192fd9ad71da1;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index 2d4ea9e..f5027ed 100644 --- 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 + + namespace bbtk { @@ -44,6 +49,7 @@ namespace bbtk wxGUIEditorGraphicBBS::wxGUIEditorGraphicBBS(wxFrame *parent) : wxFrame(parent, -1, _T("bbtkGEditor"),wxDefaultPosition, wxSize(1200,800)) { + _frameAUIMgr = new wxAuiManager(this); @@ -73,13 +79,20 @@ namespace bbtk _frameAUIMgr->Update(); _actualPkgBrowserBoxName=""; _actualPkgBrowserPkgName=""; + refreshGUIControls(); } //========================================================================= wxGUIEditorGraphicBBS::~wxGUIEditorGraphicBBS() { - _frameAUIMgr->UnInit(); + printf ("EED %p ~wxGUIEditorGraphicBBS()\n" , this ); + +//EED02JUIN2010 delete _tabsMgr; + + _frameAUIMgr->UnInit(); + + } //========================================================================= @@ -100,7 +113,7 @@ namespace bbtk //Adds a tool btn to the toolbar toolbar->AddTool(ID_NEW,_T("New"),bmp_new, wxNullBitmap, wxITEM_NORMAL,_T("New tab"), _T("Create a new panel tab")); toolbar->AddTool(ID_OPEN,_T("Open diagram"),bmp_open, wxNullBitmap, wxITEM_NORMAL,_T("Open a diagram"), _T("Open a diagram")); - toolbar->AddTool(ID_SAVE,_T("Save diagram"),bmp_save, wxNullBitmap, wxITEM_NORMAL,_T("Saves actual diagram"), _T("Saves actual diagram")); + toolbar->AddTool(ID_SAVE_AS_DIAGRAM,_T("Save diagram"),bmp_save, wxNullBitmap, wxITEM_NORMAL,_T("Saves actual diagram"), _T("Saves actual diagram")); toolbar->AddTool(ID_RUN,_T("Run"),bmp_run, wxNullBitmap, wxITEM_NORMAL,_T("Execute actual diagram"), _T("Execute actual diagram")); 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")); @@ -119,7 +132,7 @@ namespace bbtk // connect command event handlers Connect(ID_NEW,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreateNewTab)); Connect(ID_OPEN,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnOpenDiagram)); - Connect(ID_SAVE,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveActualDiagram)); + Connect(ID_SAVE_AS_DIAGRAM,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveActualDiagram)); 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)); @@ -140,23 +153,40 @@ namespace bbtk //========================================================================= void wxGUIEditorGraphicBBS::initMenu() { - // create a menu bar - wxMenu *fileMenu = new wxMenu; - - // the "About" item should be in the help menu - wxMenu *helpMenu = new wxMenu; - helpMenu->Append(wxID_ABOUT, _T("&About..."), _T("About")); + // Create File menu and its items + 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)); - // now append the freshly created menu to the menu bar... + // Create Help menu and its items + wxMenu *editMenu = new wxMenu; + editMenu->Append(ID_COPY_TO_COMPLEXDIAGRAM, _T("Copy selected to complex box"), _T("Creates a new complex box diagram with selected boxes")); + + Connect(ID_COPY_TO_COMPLEXDIAGRAM,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCopySelectedToComplexDiagram)); + + // Create Help menu and its items + wxMenu *helpMenu = new wxMenu; + helpMenu->Append(wxID_ABOUT, _T("&About..."), _T("About")); + + // Append the created menu to the menu bar wxMenuBar *menuBar = new wxMenuBar(); menuBar->Append(fileMenu, _T("&File")); + menuBar->Append(editMenu, _T("&Edit")); menuBar->Append(helpMenu, _T("&Help")); - // attach this menu bar to the frame - SetMenuBar(menuBar); + // Attach this menu bar to the frame + SetMenuBar(menuBar); } //========================================================================= @@ -303,14 +333,6 @@ namespace bbtk //========================================================================= - void wxGUIEditorGraphicBBS::editDiagramParameters(wxVtkSceneManager* scene) - { - wxBlackBoxEditionDialog* dialog = new wxBlackBoxEditionDialog(this,scene); - dialog->Show(); - } - - //========================================================================= - void wxGUIEditorGraphicBBS::updateStatusBar(std::string textStatus) { SetStatusText(crea::std2wx(textStatus)); @@ -328,23 +350,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(); - command +="C:/temp/bbtkBIN/RelWithDebInfo//"; +//EED command +="C:/temp/bbtkBIN/RelWithDebInfo//"; +//EED command +="C:/Program Files/CreaTools/bbtk-0.9.5/bin"; + #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 @@ -362,42 +395,131 @@ namespace bbtk void wxGUIEditorGraphicBBS::OnCreateNewTab(wxCommandEvent& event) { _tabsMgr->addNewTab(); - refreshToolbar(); + refreshGUIControls(); } //========================================================================= void wxGUIEditorGraphicBBS::OnExecuteActualDiagram(wxCommandEvent& event) { - std::string script = _tabsMgr->getActualDiagramScript(); + std::string script = _tabsMgr->getActualDiagramBBS(); cout<<"RaC wxGUIEditorGraphicBBS::executeActualDiagram SCRIPT"<ShowModal() == wxID_OK) + { + wxString fileName = openFileDialog->GetPath( ); +printf("EED wxGUIEditorGraphicBBS::OnOpenBBS file=%s\n", (const char*) (fileName.mb_str()) ); + + + _tabsMgr->addNewTab(); + + +// bbtk::EExecuterBBSG::Pointer exe = bbtk::EExecuterBBSG::New( this->_tabsMgr->getActualTabPanel()->getSceneManager() , _pkgBrowser->GetFactory() ); + 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( ); + + ofstream file; + +//EED file.open(fileName.c_str()); + file.open( (const char*) (fileName.mb_str()) ); + + std::string content=""; + + // writing file header + content += "# ----------------------------------\n"; + content += "# - BBTKGEditor v 1.0 BBS BlackBox Script\n"; + content += "# ----------------------------------\n"; + content += "\n"; + content += _tabsMgr->getActualDiagramBBS(); + file << content; + file.close(); + } + + } + + //========================================================================= + + void wxGUIEditorGraphicBBS::OnSaveActualComplexBox(wxCommandEvent& event) + { + wxTextEntryDialog *nameDialog = new wxTextEntryDialog(this,wxT("Name of complex box")); + std::string cbName=""; + if (nameDialog->ShowModal() == wxID_OK) + { + wxString fileName = nameDialog->GetValue(); + cbName=(const char*) (fileName.mb_str()); + } + + if(!cbName.empty()) + { + wxFileDialog * saveFileDialog = new wxFileDialog(this ,wxT("Save Complex Box BBS") ,wxEmptyString, wxString( cbName.c_str(), wxConvUTF8),wxT("*.bbs"), wxSAVE | wxOVERWRITE_PROMPT); + if (saveFileDialog->ShowModal() == wxID_OK) + { + wxString fileName = saveFileDialog->GetPath(); + + ofstream file; + file.open( (const char*) (fileName.mb_str()) ); + + std::string content=""; + + // writing file header + content += "# ----------------------------------\n"; + content += "# - BBTKGEditor v 1.1 BBS BlackBox Script (Complex Box)\n"; + content += "# ----------------------------------\n"; + content += "\n"; + content += _tabsMgr->getActualComplexBoxBBS(cbName); + file << content; + file.close(); + } + } + + } + //========================================================================= - /*****************************************************/ - /* HANDLERS - /*****************************************************/ void wxGUIEditorGraphicBBS::OnSaveActualDiagram(wxCommandEvent& event) { - wxFileDialog * saveFileDialog = new wxFileDialog(this,wxT("Save actual diagram"),wxEmptyString,"NewDiagram","*.bbd",wxSAVE|wxOVERWRITE_PROMPT); + wxFileDialog * saveFileDialog = new wxFileDialog(this,wxT("Save actual diagram"),wxEmptyString,wxT("NewDiagram"),wxT("*.bbg"),wxSAVE|wxOVERWRITE_PROMPT); if (saveFileDialog->ShowModal() == wxID_OK) { wxString fileName = saveFileDialog->GetPath(); ofstream file; - file.open(fileName.c_str()); + file.open( (const char*) (fileName.mb_str()) ); std::string content=""; // writing file header content += "# ----------------------------------\n"; - content += "# - BBTKGEditor v 1.0 BBD BlackBox Diagram file\n"; + content += "# - BBTKGEditor v 1.0 BBG BlackBox Diagram file\n"; content += "# - "; - content += fileName; + + content += (const char*) (fileName.mb_str()); + content += "\n"; content += "# ----------------------------------\n"; content += "\n"; @@ -412,29 +534,38 @@ namespace bbtk //========================================================================= - void wxGUIEditorGraphicBBS::refreshToolbar() + void wxGUIEditorGraphicBBS::refreshGUIControls() { wxToolBar* toolbar = GetToolBar(); if(_tabsMgr->isActualDiagramComplexBox()) { toolbar->ToggleTool(ID_BTNCOMPLEXBOX,true); + toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT,true); + toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT,true); + + GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_COMPLEXBOX,true); + GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_BBS,false); } else { toolbar->ToggleTool(ID_BTNCOMPLEXBOX,false); - } + toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT,false); + toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT,false); - bool temp = toolbar->GetToolState(ID_BTNCOMPLEXBOX); - if(temp) + GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_COMPLEXBOX,false); + GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_BBS,true); + } + + if(_tabsMgr->getNumActualSelectedObjects()>0) { - toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT,true); - toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT,true); + GetMenuBar()->GetMenu(1)->Enable(ID_COPY_TO_COMPLEXDIAGRAM,true); } else { - toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT,false); - toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT,false); + ///TODO Fix the possibility to say from the SceneManager to the GUI to refresh the options + GetMenuBar()->GetMenu(1)->Enable(ID_COPY_TO_COMPLEXDIAGRAM,true); } + } //========================================================================= @@ -460,21 +591,24 @@ namespace bbtk void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) { - wxFileDialog * openFileDialog = new wxFileDialog(this,wxT("Open diagram"),wxEmptyString,"","*.bbd",wxOPEN|wxFILE_MUST_EXIST); + wxFileDialog * openFileDialog = new wxFileDialog(this,wxT("Open diagram"),wxEmptyString,wxT(""),wxT("*.bbg"),wxOPEN|wxFILE_MUST_EXIST); if (openFileDialog->ShowModal() == wxID_OK) { wxString fileName = openFileDialog->GetPath(); ifstream inputStream; - inputStream.open(fileName.c_str()); + +//EED inputStream.open(fileName.c_str()); + inputStream.open( (const char*) (fileName.mb_str()) ); + + _tabsMgr->addNewTab(); _tabsMgr->loadDiagram(inputStream); inputStream.close(); - - } + refreshGUIControls(); } //========================================================================= @@ -485,17 +619,13 @@ namespace bbtk bool temp = toolbar->GetToolState(ID_BTNCOMPLEXBOX); if(temp) { - toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT,true); - toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT,true); _tabsMgr->setActualDiagramComplexBox(true); } else { - toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT,false); - toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT,false); _tabsMgr->setActualDiagramComplexBox(false); } - + refreshGUIControls(); } //========================================================================= @@ -508,7 +638,7 @@ namespace bbtk wxString fileName = nameDialog->GetValue(); if(!fileName.IsEmpty()) { - std::string portName=fileName; + std::string portName=(const char*) (fileName.mb_str()); _tabsMgr->addActualDiagramComplexInputPort(portName); } } @@ -524,7 +654,7 @@ namespace bbtk wxString fileName = nameDialog->GetValue(); if(!fileName.IsEmpty()) { - std::string portName=fileName; + std::string portName=(const char*) (fileName.mb_str()); _tabsMgr->addActualDiagramComplexOutputPort(portName); } } @@ -532,6 +662,13 @@ namespace bbtk //========================================================================= + void wxGUIEditorGraphicBBS::OnCopySelectedToComplexDiagram(wxCommandEvent& event) + { + _tabsMgr->copySelectedBBoxesToComplexDiagram(); + } + + //========================================================================= + void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event) { Close(true);