#include <InterpreterBBS.h>
-
-
namespace bbtk
{
//EED02JUIN2010 delete _tabsMgr;
_frameAUIMgr->UnInit();
+ // FCY memory leaks
+ delete _frameAUIMgr;
+ delete _notebook;
+ delete _tabsMgr;
}
wxBitmap bmp_delete(delete_xpm);
wxBitmap bmp_centerview(centerview_xpm);
wxBitmap bmp_box(box_xpm);
+ wxBitmap bmp_executablebox(executablebox_xpm);
wxBitmap bmp_complexbox(complexbox_xpm);
wxBitmap bmp_complexinputport(complexinputport_xpm);
wxBitmap bmp_complexoutputport(complexoutputport_xpm);
//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_AS_DIAGRAM,_T("Save diagram"),bmp_save, wxNullBitmap, wxITEM_NORMAL,_T("Saves actual diagram"), _T("Saves actual diagram"));
+ toolbar->AddTool(ID_SAVE_DIAGRAM,_T("Save Diagram"),bmp_save, wxNullBitmap, wxITEM_NORMAL,_T("Saves the current diagram"), _T("Saves the current diagram")); //DFCH
+ //toolbar->AddTool(ID_SAVE_AS_DIAGRAM,_T("Save Diagram As"),bmp_save, wxNullBitmap, wxITEM_NORMAL,_T("Saves the current diagram"), _T("Saves the current diagram")); //DFCH
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"));
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_BTEXECUTABLEBOX,_T("Select as executable Box"),bmp_executablebox, wxNullBitmap, wxITEM_NORMAL,_T("Select as executable Box"), _T("Select as executable 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 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_AS_DIAGRAM,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveActualDiagram));
+ Connect(ID_SAVE_DIAGRAM,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveActualDiagram)); //DFCH
+ Connect(ID_SAVE_AS_DIAGRAM,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveAsActualDiagram)); //DFCH
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_BTEXECUTABLEBOX,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnClickBtnExecutableBox));
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));
// 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_SAVE_DIAGRAM, _T("Save Diagram"), _T("Save Diagram")); //DFCH
+ fileMenu->Append(ID_SAVE_AS_DIAGRAM, _T("Save Diagram As"), _T("Save Diagram As")); //DFCH
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_SAVE_DIAGRAM,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveActualDiagram)); //DFCH
+ Connect(ID_SAVE_AS_DIAGRAM,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnSaveAsActualDiagram));
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));
helpMenu->Append(ID_HELP_BBEDITOR, _T("&Help..."), _T("Help"));
Connect(ID_HELP_BBEDITOR,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnHelpBBeditor));
+ // Create Tool menu
+ wxMenu *menuTools = new wxMenu;
+ menuTools->Append( ID_bbEditor_Tool_Menu_CreatePackage, _T("Create &package") );
+ menuTools->Append( ID_bbEditor_Tool_Menu_CreateBlackBox, _T("Create &blackbox") );
+ menuTools->Append( ID_bbEditor_Tool_Menu_PlugPackage, _T("Plug package") );
+ menuTools->Append( ID_bbEditor_Tool_Menu_EditConfig, _T("&Edit bbtk config") );
+ menuTools->Append( ID_bbEditor_Tool_Menu_ShowHTMLDoc, _T("Show &HTML documentation") );
+ menuTools->Append( ID_bbEditor_Tool_Menu_CreateIndex, _T("&Generate index") );
+
+ Connect(ID_bbEditor_Tool_Menu_CreatePackage,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreatePackage));
+ Connect(ID_bbEditor_Tool_Menu_CreateBlackBox,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreateBlackBox));
+ Connect(ID_bbEditor_Tool_Menu_PlugPackage,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnPlugPackage));
+ Connect(ID_bbEditor_Tool_Menu_EditConfig,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditConfig));
+ Connect(ID_bbEditor_Tool_Menu_ShowHTMLDoc,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnShowHTMLDoc));
+ Connect(ID_bbEditor_Tool_Menu_CreateIndex,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreateIndex));
+
// 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"));
+ menuBar->Append( fileMenu, _T("&File") );
+ menuBar->Append( editMenu, _T("&Edit") );
+ menuBar->Append( menuTools, _T("&Tool") );
+ menuBar->Append( helpMenu, _T("&Help") );
// Attach this menu bar to the frame
SetMenuBar(menuBar);
void wxGUIEditorGraphicBBS::executeScript(std::string script)
{
- 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";
+ 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 = "\""+ crea::System::GetExecutablePath();
-
-
-#ifdef MACOSX
- command += separator + "../../../bbi.app/Contents/MacOS";
+ std::string command = "";
+
+#ifdef WIN32
+ command += "start /b ";
#endif
+
+
+// command += "\""+ crea::System::GetExecutablePath();
+//#ifdef MACOSX
+// command += separator + "../../../bbi.app/Contents/MacOS";
+//#endif
- #ifdef WIN32
- command += "\"";
- #endif
/*
command += separator + "bbi\" ";
#endif
*/
- command += separator + "bbi\" ";
+
+//#ifndef WIN32
+// command += separator;
+//#endif
+
+
+ command += "bbi ";
command += "\""+filename + "\"";
- #ifdef WIN32
- command += "\"";
- #endif
+
+// #ifdef WIN32
+// command += "\"";
+// #endif
- command += " & ";
+ #ifndef WIN32
+ command += " & ";
+ #endif
printf ("RaC wxGUIEditorGraphicBBS::executeScript %s \n" , command.c_str() );
system( command.c_str() );
content += "# ----------------------------------\n";
content += "\n";
content += "APP_START\n";
- _tabsMgr->saveActualDiagram(content);
+ _tabsMgr->saveActualDiagram(content, filename); //DFCH
content += "APP_END\n";
file << content;
file.close();
}
-
//=========================================================================
- void wxGUIEditorGraphicBBS::OnSaveActualDiagram(wxCommandEvent& event)
+
+ //The following method allows to save the current diagram asking the filename
+ //DFCH
+ void wxGUIEditorGraphicBBS::SaveCurrentDiagramAs( )
{
- wxFileDialog * saveFileDialog = new wxFileDialog(this,wxT("Save actual diagram"),wxEmptyString,wxT("NewDiagram"),wxT("*.bbg"),wxSAVE|wxOVERWRITE_PROMPT);
+ wxFileDialog * saveFileDialog = new wxFileDialog(this,wxT("Save current diagram"),wxEmptyString,wxT("NewDiagram"),wxT("*.bbg"),wxSAVE|wxOVERWRITE_PROMPT);
if (saveFileDialog->ShowModal() == wxID_OK)
{
- _tabsMgr->SetNameTabPanel( saveFileDialog->GetFilename() );
-
+ _tabsMgr->SetNameTabPanel( saveFileDialog->GetFilename() );
wxString pathfileName = saveFileDialog->GetPath();
std::string pathfilename = (const char*) (pathfileName.mb_str());
std::string pathfilenamebbs = pathfilename;
pathfilenamebbs[pathfilenamebbs.length()-1]='s';
-
if (_tabsMgr->isActualDiagramComplexBox()==false)
{
SaveActualDiagram( pathfilename );
} //if isActualDiagramComplexBox
} // if saveFileDialog
}
+ //=========================================================================
+ //DFCH
+ void wxGUIEditorGraphicBBS::OnSaveActualDiagram(wxCommandEvent& event)
+ {
+ std::string pathfilename = _tabsMgr->GetCurrentTabPanelPath();
+ if( pathfilename.empty() )
+ {
+ SaveCurrentDiagramAs();
+ }
+ else
+ {
+ std::string pathfilenamebbs = pathfilename;
+ pathfilenamebbs[pathfilenamebbs.length()-1]='s';
+ if (_tabsMgr->isActualDiagramComplexBox()==false)
+ {
+ SaveActualDiagram( pathfilename );
+ SaveActualBBS(pathfilenamebbs);
+ } else {
+ AskComplexBoxConfiguration();
+ SaveActualDiagram( pathfilename );
+ SaveActualComplexBox(pathfilenamebbs);
+ } //if isActualDiagramComplexBox
+ }
+ }
+ //=========================================================================
+ //DFCH
+ void wxGUIEditorGraphicBBS::OnSaveAsActualDiagram(wxCommandEvent& event)
+ {
+ SaveCurrentDiagramAs();
+ }
//=========================================================================
void wxGUIEditorGraphicBBS::refreshGUIControls()
inputStream.open( fName.c_str() );
_tabsMgr->addNewTab( openFileDialog->GetFilename() );
- _tabsMgr->loadDiagram(inputStream);
+ _tabsMgr->loadDiagram(inputStream, fName);
inputStream.close();
}
//=========================================================================
+ void wxGUIEditorGraphicBBS::OnClickBtnExecutableBox(wxCommandEvent& event)
+ {
+ printf("EED wxGUIEditorGraphicBBS::OnClickBtnExecutableBox .... not implemented ...\n");
+ }
+
+ //=========================================================================
void wxGUIEditorGraphicBBS::OnClickBtnComplexBox(wxCommandEvent& event)
{
void wxGUIEditorGraphicBBS::OnHelpBBeditor(wxCommandEvent& event)
{
- printf("wxGUIEditorGraphicBBS::OnHelpBBeditor ......\n");
+ printf("wxGUIEditorGraphicBBS::OnHelpBBeditor ....not implemented..\n");
}
+ //=========================================================================
+ void wxGUIEditorGraphicBBS::OnCreatePackage(wxCommandEvent& event)
+ {
+ printf("EED wxGUIEditorGraphicBBS::OnCreatePackag ... not implemented ..\n");
+ }
+
+
+ //=========================================================================
+ void wxGUIEditorGraphicBBS::OnCreateBlackBox(wxCommandEvent& event)
+ {
+ printf("EED wxGUIEditorGraphicBBS::OnCreateBlackBox ... not implemented ..\n");
+ }
+ //=========================================================================
+ void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event)
+ {
+ printf("EED wxGUIEditorGraphicBBS::OnPlugPackage ... not implemented ..\n");
+ }
+ //=========================================================================
+ void wxGUIEditorGraphicBBS::OnEditConfig(wxCommandEvent& event)
+ {
+ printf("EED wxGUIEditorGraphicBBS::OnEditConfig ... not implemented ..\n");
+ }
+ //=========================================================================
+ void wxGUIEditorGraphicBBS::OnShowHTMLDoc(wxCommandEvent& event)
+ {
+ printf("EED wxGUIEditorGraphicBBS::OnShowHTMLDoc ... not implemented ..\n");
+ }
+ //=========================================================================
+ void wxGUIEditorGraphicBBS::OnCreateIndex(wxCommandEvent& event)
+ {
+ printf("EED wxGUIEditorGraphicBBS::OnCreateIndex ... not implemented ..\n");
+ }
+
+
+
//=========================================================================
git://git.creatis.insa-lyon.fr / bbtkGEditor.git / blobdiff