#include <InterpreterBBS.h>
-
-
namespace bbtk
{
//EED02JUIN2010 delete _tabsMgr;
_frameAUIMgr->UnInit();
+ // FCY memory leaks
+ delete _frameAUIMgr;
+ delete _notebook;
+ delete _tabsMgr;
}
//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"));
// 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));
// 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));
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();
+ std::string command = "";
+
+ #ifdef WIN32
+ command += "\"";
+ #endif
+ command += "\""+ crea::System::GetExecutablePath();
#ifdef MACOSX
command += separator + "../../../bbi.app/Contents/MacOS";
#endif
- #ifdef WIN32
- command += "\"";
- #endif
/*
command += "\"";
#endif
- command += " & ";
+ #ifndef WIN32
+ command += " & ";
+ #endif
printf ("RaC wxGUIEditorGraphicBBS::executeScript %s \n" , command.c_str() );
system( command.c_str() );
wxString fileName = openFileDialog->GetPath( );
- _tabsMgr->addNewTab();
+ _tabsMgr->addNewTab( openFileDialog->GetFilename() );
bbtk::InterpreterBBS::Pointer I = bbtk::InterpreterBBS::New( this->_tabsMgr->getActualTabPanel()->getSceneManager() , _pkgBrowser->GetFactory());
std::string content="";
// writing file header
content += "# ----------------------------------\n";
- content += "# - BBTKGEditor v 1.1 BBS BlackBox Script\n";
+ content += "# - BBTKGEditor v 1.2 BBS BlackBox Script\n";
content += "# - ";
content += filename;
content += "\n";
}
- //=========================================================================
+ void wxGUIEditorGraphicBBS::AskComplexBoxConfiguration()
+ {
+ std::string cbName = _tabsMgr->GetCbName();
+ std::string paName = _tabsMgr->GetCbPackageName();
- void wxGUIEditorGraphicBBS::SaveActualComplexBox(std::string filename)
- {
wxTextEntryDialog *cbNameDialog = new wxTextEntryDialog(this,wxT("Complex Box name"));
- cbNameDialog->SetValue(_T("BBBBoxName"));
- std::string cbName="";
+ wxTextEntryDialog *paNameDialog = new wxTextEntryDialog(this,wxT("Package name"));
+
+ cbNameDialog->SetValue( wxString(cbName.c_str(),wxConvUTF8) );
+ paNameDialog->SetValue( wxString(paName.c_str(),wxConvUTF8) );
+
if (cbNameDialog->ShowModal() == wxID_OK)
{
wxString complexboxname = cbNameDialog->GetValue();
cbName=(const char*) (complexboxname.mb_str());
}
- wxTextEntryDialog *paNameDialog = new wxTextEntryDialog(this,wxT("Package name"));
- paNameDialog->SetValue(_T("PPPPackageName"));
- std::string paName="";
+
if (paNameDialog->ShowModal() == wxID_OK)
{
wxString packagename = paNameDialog->GetValue();
paName=(const char*) (packagename.mb_str());
}
- if( (!cbName.empty()) || (!paName.empty()) )
- {
+ _tabsMgr->SetCbName(cbName);
+ _tabsMgr->SetCbPackageName(paName);
+ }
- ofstream file;
- 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,paName);
- file << content;
- file.close();
- }
+ //=========================================================================
+ void wxGUIEditorGraphicBBS::SaveActualComplexBox(std::string filename)
+ {
+ ofstream file;
+ file.open( filename.c_str() );
+
+ std::string content="";
+ // writing file header
+ content += "# ----------------------------------\n";
+ content += "# - BBTKGEditor v 1.2 BBS BlackBox Script (Complex Box)\n";
+ content += "# - ";
+ content += filename;
+ content += "\n";
+ content += "# ----------------------------------\n";
+ content += "\n";
+ content += _tabsMgr->getActualComplexBoxBBS();
+ file << content;
+ file.close();
}
//=========================================================================
// writing file header
content += "# ----------------------------------\n";
- content += "# - BBTKGEditor v 1.1 BBG BlackBox Diagram file\n";
+ content += "# - BBTKGEditor v 1.2 BBG BlackBox Diagram file\n";
content += "# - ";
content += filename;
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)
{
- wxString fileName = saveFileDialog->GetPath();
- std::string filename = (const char*) (fileName.mb_str());
- std::string filenamebbs = filename;
- filenamebbs[filename.length()-1]='s';
-
- SaveActualDiagram( filename );
+ _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)
{
- SaveActualBBS(filenamebbs);
+ SaveActualDiagram( pathfilename );
+ SaveActualBBS(pathfilenamebbs);
} else {
- SaveActualComplexBox(filenamebbs);
+ AskComplexBoxConfiguration();
+ SaveActualDiagram( pathfilename );
+ SaveActualComplexBox(pathfilenamebbs);
} //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()
{
wxString fileName = openFileDialog->GetPath();
ifstream inputStream;
-//EED inputStream.open(fileName.c_str());
- inputStream.open( (const char*) (fileName.mb_str()) );
- _tabsMgr->addNewTab();
+ std::string fName=(const char*) (fileName.mb_str());
+ inputStream.open( fName.c_str() );
+ _tabsMgr->addNewTab( openFileDialog->GetFilename() );
+
_tabsMgr->loadDiagram(inputStream);
inputStream.close();