X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=f3f6a04d7e6e8624a984ff3240e38ea3541f9940;hb=20073a9f91d67c6a712e01bdd9146f34d226c84f;hp=f75b97e9c1bf0f2982d3beae4493db49b8634658;hpb=b07121ce96dd600b41cb6b9588d117ec72969317;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index f75b97e..f3f6a04 100644 --- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx +++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx @@ -1,4 +1,4 @@ -/*========================================================================= +/*========================================================================= Program: bbtk Module: $RCSfile$ Language: C++ @@ -11,30 +11,35 @@ Version: $Revision$ * Copyright (c) CREATIS-LRMN (Centre de Recherche en Imagerie Medicale) * Authors : Eduardo Davila, Laurent Guigues, Jean-Pierre Roux * -* This software is governed by the CeCILL-B license under French law and -* abiding by the rules of distribution of free software. You can use, -* modify and/ or redistribute the software under the terms of the CeCILL-B -* license as circulated by CEA, CNRS and INRIA at the following URL -* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html +* This software is governed by the CeCILL-B license under French law and +* abiding by the rules of distribution of free software. You can use, +* modify and/ or redistribute the software under the terms of the CeCILL-B +* license as circulated by CEA, CNRS and INRIA at the following URL +* http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html * or in the file LICENSE.txt. * * As a counterpart to the access to the source code and rights to copy, * modify and redistribute granted by the license, users are provided only * with a limited warranty and the software's author, the holder of the * economic rights, and the successive licensors have only limited -* liability. +* liability. * * The fact that you are presently reading this means that you have had * knowledge of the CeCILL-B license and that you accept its terms. -* ------------------------------------------------------------------------ */ +* ------------------------------------------------------------------------ */ /** -* \file -* \brief Class bbtk::WxInterfaceEditorGraphicBBS . +* \file +* \brief Class bbtk::WxInterfaceEditorGraphicBBS . */ #include "bbtkwxGUIEditorGraphicBBS.h" #include "creaWx.h" +#include "creaSystem.h" + +#include + + namespace bbtk { @@ -44,8 +49,9 @@ namespace bbtk wxGUIEditorGraphicBBS::wxGUIEditorGraphicBBS(wxFrame *parent) : wxFrame(parent, -1, _T("bbtkGEditor"),wxDefaultPosition, wxSize(1200,800)) { + _frameAUIMgr = new wxAuiManager(this); - + /*std::string datadir( crea::System::GetExecutablePath() ); std::string datadir ("."); @@ -53,13 +59,13 @@ namespace bbtk cout<<"RaC //TODO wxGUIEditorGraphicBBS constructor.Initialize datadir with crea::System::GetExecutablePath() ."<UnInit(); + printf ("EED %p ~wxGUIEditorGraphicBBS()\n" , this ); + +//EED02JUIN2010 delete _tabsMgr; + + _frameAUIMgr->UnInit(); + + } //========================================================================= void wxGUIEditorGraphicBBS::initToolbar() - { + { wxBitmap bmp_new(new_xpm); wxBitmap bmp_open(open_xpm); wxBitmap bmp_save(save_xpm); 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); @@ -106,13 +119,15 @@ 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")); toolbar->AddTool(ID_ADDCOMPLEXBOXOUTPUT,_T("Add output to Complex box"),bmp_complexoutputport, wxNullBitmap, wxITEM_NORMAL,_T("Add output Complex box"), _T("Add output Complex box")); toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT,false); toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT,false); - + toolbar->SetMargins( 2, 2 ); toolbar->Realize(); SetToolBar(toolbar); @@ -124,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)); @@ -135,37 +151,48 @@ namespace bbtk //TO FIX THE PATH OF BBTK BIN IN ORDER TO USE REGENERATE EXECUTABLES //RegenerateAll(); _helpHtmlBrowser = new WxGUIHtmlBrowser(this,wxSize(200,0)); - _frameAUIMgr->AddPane(_helpHtmlBrowser,wxAuiPaneInfo().Right().MinSize(200,200)); + _frameAUIMgr->AddPane(_helpHtmlBrowser,wxAuiPaneInfo().Right().MinSize(200,200)); } //========================================================================= void wxGUIEditorGraphicBBS::initMenu() { - // create a menu bar + // 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)); - // the "About" item should be in the help menu + // 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")); + helpMenu->Append(wxID_ABOUT, _T("&About..."), _T("About")); + helpMenu->Append(ID_HELP_BBEDITOR, _T("&Help..."), _T("Help")); + Connect(ID_HELP_BBEDITOR,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnHelpBBeditor)); - // now append the freshly created menu to the menu bar... + // 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); } //========================================================================= @@ -173,16 +200,16 @@ namespace bbtk { _notebook = new wxAuiNotebook(this,wxID_NOTEBOOK,wxDefaultPosition,wxDefaultSize,wxAUI_NB_TOP|wxAUI_NB_TAB_MOVE|wxAUI_NB_CLOSE_ON_ACTIVE_TAB|wxAUI_NB_TAB_FIXED_WIDTH|wxAUI_NB_WINDOWLIST_BUTTON); _tabsMgr = new wxTabPanelsManager(this); - _frameAUIMgr->AddPane(_notebook,wxAuiPaneInfo().CenterPane()); + _frameAUIMgr->AddPane(_notebook,wxAuiPaneInfo().CenterPane()); } - + //========================================================================= void wxGUIEditorGraphicBBS::initPackageBrowser() { _pkgBrowser = new WxGUIPackageBrowser2(this); _pkgBrowser->IncludeAll(); - _frameAUIMgr->AddPane(_pkgBrowser,wxAuiPaneInfo().Left().MinSize(200,200).CloseButton(false)); + _frameAUIMgr->AddPane(_pkgBrowser,wxAuiPaneInfo().Left().MinSize(200,200).CloseButton(false)); } //================================================================ @@ -197,8 +224,8 @@ namespace bbtk { mess = "Regenerating doc for all packages"; } - - mess += " ... please wait"; + + mess += " ... please wait"; SetStatusText( std2wx(mess) ); @@ -227,12 +254,12 @@ namespace bbtk wxOK | wxICON_INFORMATION); */ } - else + else { SetStatusText( _T("Done !")); wxString err(_T("An error occured while running '")); err += bbtk::std2wx(command) + _T("'"); - wxMessageBox(err,_T("Regenerate package doc"),wxOK | wxICON_ERROR); + wxMessageBox(err,_T("Regenerate package doc"),wxOK | wxICON_ERROR); } } @@ -265,19 +292,19 @@ namespace bbtk wxOK | wxICON_INFORMATION); */ } - else + else { SetStatusText( _T("Done !")); wxString err(_T("An error occured while running '")); err += bbtk::std2wx(command) + _T("'"); - wxMessageBox(err,_T("Regenerate boxes lists"),wxOK | wxICON_ERROR); + wxMessageBox(err,_T("Regenerate boxes lists"),wxOK | wxICON_ERROR); } } - + //================================================================ void wxGUIEditorGraphicBBS::RegenerateAll() { - DoRegeneratePackageDoc("-a"); + DoRegeneratePackageDoc("-a"); DoRegenerateBoxesLists(); } @@ -312,14 +339,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)); @@ -332,45 +351,56 @@ namespace bbtk std::string separator = ConfigurationFile::GetInstance().Get_file_separator (); std::string dir = ConfigurationFile::GetInstance().Get_default_temp_dir(); std::string filename = dir + separator + "tmp_bbtk.bbs"; - + ofstream tempFile; 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\" "; - #else + 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 command += " & "; - + printf ("RaC wxGUIEditorGraphicBBS::executeScript %s \n" , command.c_str() ); system( command.c_str() ); } //========================================================================= - // EVENT HANDLERS + // EVENT HANDLERS //========================================================================= void wxGUIEditorGraphicBBS::OnCreateNewTab(wxCommandEvent& event) { - _tabsMgr->addNewTab(); + _tabsMgr->addNewTab(); refreshGUIControls(); } @@ -378,107 +408,165 @@ namespace bbtk void wxGUIEditorGraphicBBS::OnExecuteActualDiagram(wxCommandEvent& event) { - std::string script = _tabsMgr->getActualDiagramBBS(); - cout<<"RaC wxGUIEditorGraphicBBS::executeActualDiagram SCRIPT"<getActualDiagramBBS(true); + cout<getActualDiagramBBS(false); + executeScript(script2); } + //========================================================================= - // HANDLERS + // 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::SaveActualBBS(std::string filename) + { + ofstream file; + +//EED file.open(fileName.c_str()); + file.open( filename.c_str() ); + std::string content=""; + // writing file header + content += "# ----------------------------------\n"; + content += "# - BBTKGEditor v 1.1 BBS BlackBox Script\n"; + content += "# - "; + content += filename; + content += "\n"; + content += "# ----------------------------------\n"; + content += "\n"; + content += _tabsMgr->getActualDiagramBBS(); + file << content; + file.close(); + } + void wxGUIEditorGraphicBBS::OnSaveActualBBS(wxCommandEvent& event) { - wxFileDialog * saveFileDialog = new wxFileDialog(this,wxT("Save actual BBS"),wxEmptyString,"NewBBS","*.bbs",wxSAVE|wxOVERWRITE_PROMPT); + 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; - file.open(fileName.c_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(); + wxString fileName = saveFileDialog->GetPath( ); + SaveActualBBS( (const char*) (fileName.mb_str()) ); } } + //========================================================================= - void wxGUIEditorGraphicBBS::OnSaveActualComplexBox(wxCommandEvent& event) + 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 fileName = nameDialog->GetValue(); - cbName=fileName; - } + wxString complexboxname = nameDialog->GetValue(); + cbName=(const char*) (complexboxname.mb_str()); + } if(!cbName.empty()) - { - wxFileDialog * saveFileDialog = new wxFileDialog(this,wxT("Save Complex Box BBS"),wxEmptyString,cbName,"*.bbs",wxSAVE|wxOVERWRITE_PROMPT); - if (saveFileDialog->ShowModal() == wxID_OK) - { - wxString fileName = saveFileDialog->GetPath(); - + { + ofstream file; - file.open(fileName.c_str()); + 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(); - } } + } //========================================================================= + void wxGUIEditorGraphicBBS::OnSaveActualComplexBox(wxCommandEvent& event) + { + wxFileDialog * saveFileDialog = new wxFileDialog(this ,wxT("Save Complex Box BBS") ,wxEmptyString, _T("ComplexBoxName") ,wxT("*.bbs"), wxSAVE | wxOVERWRITE_PROMPT); + if (saveFileDialog->ShowModal() == wxID_OK) + { + wxString fileName = saveFileDialog->GetPath(); + SaveActualComplexBox( (const char*) (fileName.mb_str()) ); + } + } + + //========================================================================= + void wxGUIEditorGraphicBBS::SaveActualDiagram(std::string filename) + { + ofstream file; + file.open( filename.c_str() ); + + std::string content=""; + + // writing file header + content += "# ----------------------------------\n"; + content += "# - BBTKGEditor v 1.1 BBG BlackBox Diagram file\n"; + content += "# - "; + + content += filename; + + content += "\n"; + content += "# ----------------------------------\n"; + content += "\n"; + content += "APP_START\n"; + _tabsMgr->saveActualDiagram(content); + content += "APP_END\n"; + file << content; + file.close(); + } + + + //========================================================================= 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()); - - std::string content=""; - - // writing file header - content += "# ----------------------------------\n"; - content += "# - BBTKGEditor v 1.0 BBD BlackBox Diagram file\n"; - content += "# - "; - content += fileName; - content += "\n"; - content += "# ----------------------------------\n"; - content += "\n"; - content += "APP_START\n"; - _tabsMgr->saveActualDiagram(content); - content += "APP_END\n"; - file << content; - file.close(); - } - + wxString fileName = saveFileDialog->GetPath(); + std::string filename = (const char*) (fileName.mb_str()); + std::string filenamebbs = filename+"s"; + + SaveActualDiagram( filename ); + if (_tabsMgr->isActualDiagramComplexBox()==false) + { + SaveActualBBS(filenamebbs); + } else { + SaveActualComplexBox(filenamebbs); + } //if isActualDiagramComplexBox + } // if saveFileDialog } //========================================================================= @@ -491,7 +579,7 @@ namespace bbtk 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); } @@ -505,6 +593,16 @@ namespace bbtk GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_BBS,true); } + if(_tabsMgr->getNumActualSelectedObjects()>0) + { + GetMenuBar()->GetMenu(1)->Enable(ID_COPY_TO_COMPLEXDIAGRAM,true); + } + else + { + ///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); + } + } //========================================================================= @@ -527,20 +625,18 @@ 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(); @@ -548,6 +644,30 @@ namespace bbtk //========================================================================= + + void wxGUIEditorGraphicBBS::OnClickBtnBox(wxCommandEvent& event) + { + BlackBoxDescriptor *bbDes = _pkgBrowser->GetActualSelected(); + if (bbDes!=NULL) + { + std::string typeName = bbDes->GetTypeName(); + std::string packageName = bbDes->GetPackage()->GetName(); + + + wxGEditorTabPanel *pnl = this->_tabsMgr->getActualTabPanel(); + + if (pnl!=NULL) + { + wxVtkSceneManager *scn = pnl->getSceneManager(); + scn->createGBlackBox(50,50,packageName, typeName); + scn->refresh(); + } // if pnl + }// if bbDes + } + + //========================================================================= + + void wxGUIEditorGraphicBBS::OnClickBtnComplexBox(wxCommandEvent& event) { wxToolBar* toolbar = GetToolBar(); @@ -560,23 +680,23 @@ namespace bbtk { _tabsMgr->setActualDiagramComplexBox(false); } - refreshGUIControls(); + refreshGUIControls(); } //========================================================================= void wxGUIEditorGraphicBBS::OnAddComplexBoxInput(wxCommandEvent& event) - { + { wxTextEntryDialog *nameDialog = new wxTextEntryDialog(this,wxT("Name of input port")); if (nameDialog->ShowModal() == wxID_OK) { wxString fileName = nameDialog->GetValue(); if(!fileName.IsEmpty()) { - std::string portName=fileName; + std::string portName=(const char*) (fileName.mb_str()); _tabsMgr->addActualDiagramComplexInputPort(portName); } - } + } } //========================================================================= @@ -589,12 +709,27 @@ namespace bbtk wxString fileName = nameDialog->GetValue(); if(!fileName.IsEmpty()) { - std::string portName=fileName; + std::string portName=(const char*) (fileName.mb_str()); _tabsMgr->addActualDiagramComplexOutputPort(portName); } - } + } } + //========================================================================= + + void wxGUIEditorGraphicBBS::OnCopySelectedToComplexDiagram(wxCommandEvent& event) + { + _tabsMgr->copySelectedBBoxesToComplexDiagram(); + } + + + void wxGUIEditorGraphicBBS::OnHelpBBeditor(wxCommandEvent& event) + { + printf("wxGUIEditorGraphicBBS::OnHelpBBeditor ......\n"); + } + + + //========================================================================= void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event) @@ -602,6 +737,8 @@ namespace bbtk Close(true); } + + //========================================================================= } // EO namespace bbtk