X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=592d7d01ebbd795038e2019a62a01e11a125022c;hb=ac275a79f43b892b4b5182f91b980ada0c8f4926;hp=83db82fb31b6627cd8b873d1d6a2d18197f4709f;hpb=ad952d45acb42f76461d6a84fd7ef3eb4d44efa4;p=bbtkGEditor.git diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx index 83db82f..592d7d0 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 { @@ -45,10 +50,8 @@ namespace bbtk : wxFrame(parent, -1, _T("bbtkGEditor"),wxDefaultPosition, wxSize(1200,800)) { - printf ("EED %p wxGUIEditorGraphicBBS()\n" , this ); - _frameAUIMgr = new wxAuiManager(this); - + /*std::string datadir( crea::System::GetExecutablePath() ); std::string datadir ("."); @@ -56,13 +59,13 @@ namespace bbtk cout<<"RaC //TODO wxGUIEditorGraphicBBS constructor.Initialize datadir with crea::System::GetExecutablePath() ."<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); @@ -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)); @@ -144,7 +151,7 @@ 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)); } //========================================================================= @@ -154,25 +161,29 @@ 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)); // 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")); + 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)); // Append the created menu to the menu bar wxMenuBar *menuBar = new wxMenuBar(); @@ -181,7 +192,7 @@ namespace bbtk menuBar->Append(helpMenu, _T("&Help")); // Attach this menu bar to the frame - SetMenuBar(menuBar); + SetMenuBar(menuBar); } //========================================================================= @@ -189,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)); } //================================================================ @@ -213,8 +224,8 @@ namespace bbtk { mess = "Regenerating doc for all packages"; } - - mess += " ... please wait"; + + mess += " ... please wait"; SetStatusText( std2wx(mess) ); @@ -243,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); } } @@ -281,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(); } @@ -340,48 +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(); //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\" "; - #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(); } @@ -389,34 +408,55 @@ 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::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; -//EED file.open(fileName.c_str()); +//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 += "# - BBTKGEditor v 1.1 BBS BlackBox Script\n"; content += "# ----------------------------------\n"; content += "\n"; content += _tabsMgr->getActualDiagramBBS(); @@ -435,23 +475,21 @@ namespace bbtk if (nameDialog->ShowModal() == wxID_OK) { wxString fileName = nameDialog->GetValue(); -//EED cbName=fileName; 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; -//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.1 BBS BlackBox Script (Complex Box)\n"; @@ -473,26 +511,24 @@ namespace bbtk 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 BBG BlackBox Diagram file\n"; + content += "# - BBTKGEditor v 1.1 BBG BlackBox Diagram file\n"; content += "# - "; -//EED content += fileName; content += (const char*) (fileName.mb_str()); content += "\n"; content += "# ----------------------------------\n"; content += "\n"; content += "APP_START\n"; - _tabsMgr->saveActualDiagram(content); + _tabsMgr->saveActualDiagram(content); content += "APP_END\n"; file << content; file.close(); @@ -510,7 +546,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); } @@ -523,7 +559,7 @@ namespace bbtk GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_COMPLEXBOX,false); GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_BBS,true); } - + if(_tabsMgr->getNumActualSelectedObjects()>0) { GetMenuBar()->GetMenu(1)->Enable(ID_COPY_TO_COMPLEXDIAGRAM,true); @@ -556,33 +592,49 @@ namespace bbtk //========================================================================= - void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) { wxFileDialog * openFileDialog = new wxFileDialog(this,wxT("Open diagram"),wxEmptyString,wxT(""),wxT("*.bbg"),wxOPEN|wxFILE_MUST_EXIST); if (openFileDialog->ShowModal() == wxID_OK) { -printf("EED %p wxGUIEditorGraphicBBS::OnOpenDiagram 1\n", this); wxString fileName = openFileDialog->GetPath(); - ifstream inputStream; - //EED inputStream.open(fileName.c_str()); inputStream.open( (const char*) (fileName.mb_str()) ); - - - _tabsMgr->addNewTab(); _tabsMgr->loadDiagram(inputStream); - + inputStream.close(); -printf("EED %p wxGUIEditorGraphicBBS::OnOpenDiagram 2\n", this); } refreshGUIControls(); } //========================================================================= + + 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(); @@ -595,13 +647,13 @@ printf("EED %p wxGUIEditorGraphicBBS::OnOpenDiagram 2\n", this); { _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) { @@ -611,7 +663,7 @@ printf("EED %p wxGUIEditorGraphicBBS::OnOpenDiagram 2\n", this); std::string portName=(const char*) (fileName.mb_str()); _tabsMgr->addActualDiagramComplexInputPort(portName); } - } + } } //========================================================================= @@ -627,7 +679,7 @@ printf("EED %p wxGUIEditorGraphicBBS::OnOpenDiagram 2\n", this); std::string portName=(const char*) (fileName.mb_str()); _tabsMgr->addActualDiagramComplexOutputPort(portName); } - } + } } //========================================================================= @@ -637,12 +689,22 @@ printf("EED %p wxGUIEditorGraphicBBS::OnOpenDiagram 2\n", this); _tabsMgr->copySelectedBBoxesToComplexDiagram(); } + + void wxGUIEditorGraphicBBS::OnHelpBBeditor(wxCommandEvent& event) + { + printf("wxGUIEditorGraphicBBS::OnHelpBBeditor ......\n"); + } + + + //========================================================================= void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event) { Close(true); } + + //=========================================================================