#include "bbtkwxGUIEditorGraphicBBS.h"
#include "creaWx.h"
+#include "creaSystem.h"
+
+#include <InterpreterBBS.h>
+
+
namespace bbtk
{
wxGUIEditorGraphicBBS::wxGUIEditorGraphicBBS(wxFrame *parent)
: wxFrame(parent, -1, _T("bbtkGEditor"),wxDefaultPosition, wxSize(1200,800))
{
+
_frameAUIMgr = new wxAuiManager(this);
//=========================================================================
wxGUIEditorGraphicBBS::~wxGUIEditorGraphicBBS()
{
- _frameAUIMgr->UnInit();
+ printf ("EED %p ~wxGUIEditorGraphicBBS()\n" , this );
+
+//EED02JUIN2010 delete _tabsMgr;
+
+ _frameAUIMgr->UnInit();
+
+
}
//=========================================================================
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);
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"));
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));
//=========================================================================
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"));
- // 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
+ // Attach this menu bar to the frame
SetMenuBar(menuBar);
}
//=========================================================================
- void wxGUIEditorGraphicBBS::editDiagramParameters(wxVtkSceneManager* scene)
- {
- wxBlackBoxEditionDialog* dialog = new wxBlackBoxEditionDialog(this,scene);
- dialog->Show();
- }
-
- //=========================================================================
-
void wxGUIEditorGraphicBBS::updateStatusBar(std::string textStatus)
{
SetStatusText(crea::std2wx(textStatus));
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
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;
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 , _T("Save Complex Box BBS") ,_T(""), wxString( cbName.c_str(), wxConvUTF8),_T(""), wxSAVE | wxOVERWRITE_PROMPT);
+ {
+ 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="";
void wxGUIEditorGraphicBBS::OnSaveActualDiagram(wxCommandEvent& event)
{
- wxFileDialog * saveFileDialog = new wxFileDialog(this,wxT("Save actual diagram"),wxEmptyString,wxT("NewDiagram"),wxT("*.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;
-//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 BBD BlackBox Diagram file\n";
+ content += "# - BBTKGEditor v 1.0 BBG BlackBox Diagram file\n";
content += "# - ";
-//EED content += fileName;
content += (const char*) (fileName.mb_str());
content += "\n";
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);
+ }
+ 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);
+ }
}
void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event)
{
- wxFileDialog * openFileDialog = new wxFileDialog(this,wxT("Open diagram"),wxEmptyString,wxT(""),wxT("*.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();
}
//=========================================================================
+
+
+ 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();
//=========================================================================
+ void wxGUIEditorGraphicBBS::OnCopySelectedToComplexDiagram(wxCommandEvent& event)
+ {
+ _tabsMgr->copySelectedBBoxesToComplexDiagram();
+ }
+
+ //=========================================================================
+
void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event)
{
Close(true);
git://git.creatis.insa-lyon.fr / bbtkGEditor.git / blobdiff