Bug #1362, Bug #1361

[bbtkGEditor.git] / lib / EditorGraphicBBS / bbsWxGUIEditorGraphic / bbtkwxGUIEditorGraphicBBS.cxx

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index ffccd104bdf0a09c631ced4eda810cb7505158ae..209007fc096074a549d862dc95c03921dcb5c862 100644 (file)
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -36,6 +36,7 @@
 #include "bbtkwxGUIEditorGraphicBBS.h"
 #include "creaWx.h"
 #include "creaSystem.h"
+#include <wx/defs.h>
 
 #include <InterpreterBBS.h>
 
@@ -79,6 +80,7 @@ wxGUIEditorGraphicBBS::wxGUIEditorGraphicBBS(wxFrame *parent) :
 
 //=========================================================================
 wxGUIEditorGraphicBBS::~wxGUIEditorGraphicBBS() {
+
        printf("EED %p ~wxGUIEditorGraphicBBS()\n", this);
 
        //EED02JUIN2010         delete _tabsMgr;
@@ -104,7 +106,8 @@ void wxGUIEditorGraphicBBS::initToolbar() {
        wxBitmap bmp_complexbox(complexbox_xpm);
        wxBitmap bmp_complexinputport(complexinputport_xpm);
        wxBitmap bmp_complexoutputport(complexoutputport_xpm);
-
+       wxBitmap bmp_undo(undo_xpm);
+       wxBitmap bmp_redo(redo_xpm);
        wxToolBar *toolbar = new wxToolBar(this, wxID_ANY);
 
        //Adds a tool btn to the toolbar
@@ -141,11 +144,16 @@ void wxGUIEditorGraphicBBS::initToolbar() {
                        _T("Add output Complex box"), _T("Add output Complex box"));
        toolbar->EnableTool(ID_ADDCOMPLEXBOXINPUT, false);
        toolbar->EnableTool(ID_ADDCOMPLEXBOXOUTPUT, false);
-
+       toolbar->AddSeparator();
+       toolbar->AddTool(ID_UNDO, _T("Undo"),bmp_undo, wxNullBitmap, wxITEM_NORMAL,     _T("Undo"), _T("Undo"));
+       toolbar->AddTool(ID_REDO, _T("Redo"),bmp_redo, wxNullBitmap, wxITEM_NORMAL,     _T("Redo"), _T("Redo"));
+       //toolbar->EnableTool(ID_UNDO, false);
+       //toolbar->EnableTool(ID_REDO, false);
        toolbar->SetMargins(2, 2);
        toolbar->Realize();
        SetToolBar(toolbar);
 
+       
        // connect command event handlers
        Connect(ID_NEW, wxEVT_COMMAND_TOOL_CLICKED,
                        wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreateNewTab));
@@ -179,6 +187,8 @@ void wxGUIEditorGraphicBBS::initToolbar() {
                        wxCommandEventHandler(wxGUIEditorGraphicBBS::OnAddComplexBoxInput));
        Connect(ID_ADDCOMPLEXBOXOUTPUT, wxEVT_COMMAND_TOOL_CLICKED,
                        wxCommandEventHandler(wxGUIEditorGraphicBBS::OnAddComplexBoxOutput));
+       Connect(ID_UNDO,wxEVT_COMMAND_TOOL_CLICKED,     wxCommandEventHandler(wxGUIEditorGraphicBBS::OnUndo));
+       Connect(ID_REDO,wxEVT_COMMAND_TOOL_CLICKED,     wxCommandEventHandler(wxGUIEditorGraphicBBS::OnRedo));
 
 }
 //=========================================================================
@@ -450,6 +460,17 @@ void wxGUIEditorGraphicBBS::executeScript(std::string script) {
        system(command.c_str());
 }
 
+//=========================================================================
+std::string wxGUIEditorGraphicBBS::CheckExtension(std::string filename, std::string extension) {
+        if(filename.size() > extension.size() ){
+                if( (filename.compare(filename.size()-extension.size(), extension.size(),extension)) !=0 ){
+                        filename.append(extension);
+                }
+        }else{
+                filename.append(extension);
+        }
+       return filename;
+}
 //=========================================================================
 // EVENT HANDLERS
 //=========================================================================
@@ -459,6 +480,21 @@ void wxGUIEditorGraphicBBS::OnCreateNewTab(wxCommandEvent& event) {
        refreshGUIControls();
 }
 
+void wxGUIEditorGraphicBBS::OnUndo(wxCommandEvent& event) {
+       unsigned short disable;
+       GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->loadTempDiagram(0));
+       if (GetToolBar()->GetToolEnabled(ID_REDO) == false)
+                       GetToolBar()->EnableTool(ID_REDO,true);
+       refreshGUIControls();
+}
+
+void wxGUIEditorGraphicBBS::OnRedo(wxCommandEvent& event) {
+       unsigned short disable;
+       GetToolBar()->EnableTool(ID_REDO, _tabsMgr->loadTempDiagram(1));
+       if (GetToolBar()->GetToolEnabled(ID_UNDO) == false)
+                       GetToolBar()->EnableTool(ID_UNDO,true);
+       refreshGUIControls();
+}
 //=========================================================================
 
 void wxGUIEditorGraphicBBS::OnExecuteActualDiagram(wxCommandEvent& event) {
@@ -519,7 +555,9 @@ void wxGUIEditorGraphicBBS::OnSaveActualBBS(wxCommandEvent& event) {
                        wxT("*.bbs"), wxSAVE | wxOVERWRITE_PROMPT);
        if (saveFileDialog->ShowModal() == wxID_OK) {
                wxString fileName = saveFileDialog->GetPath();
-               SaveActualBBS((const char*) (fileName.mb_str()));
+               std::string filename = (const char*) (fileName.mb_str());
+               filename=CheckExtension (filename, ".bbs");
+               SaveActualBBS(filename);
        }
 
 }
@@ -580,7 +618,9 @@ void wxGUIEditorGraphicBBS::OnSaveActualComplexBox(wxCommandEvent& event) {
                                        | wxOVERWRITE_PROMPT);
        if (saveFileDialog->ShowModal() == wxID_OK) {
                wxString fileName = saveFileDialog->GetPath();
-               SaveActualComplexBox((const char*) (fileName.mb_str()));
+               std::string filename = (const char*) (fileName.mb_str());
+               filename=CheckExtension (filename, ".bbs");
+               SaveActualComplexBox(filename);
        }
 }
 
@@ -608,6 +648,12 @@ void wxGUIEditorGraphicBBS::SaveActualDiagram(std::string filename) {
        file.close();
 }
 
+//=========================================================================
+void wxGUIEditorGraphicBBS::SaveTempActualDiagram() 
+{
+       _tabsMgr->saveTempActualDiagram();
+}
+
 //=========================================================================
 
 //The following method allows to save the current diagram asking the filename
@@ -617,9 +663,17 @@ void wxGUIEditorGraphicBBS::SaveCurrentDiagramAs() {
                        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());
+               pathfilename=CheckExtension (pathfilename, ".bbg");
+
+               //modify the tab name accordingly
+               wxString fileName = saveFileDialog->GetFilename();
+               std::string filename = (const char*) (fileName.mb_str());
+               filename=CheckExtension (filename, ".bbg");
+               _tabsMgr->SetNameTabPanel( wxString (filename.c_str(), wxConvUTF8) );
+
                std::string pathfilenamebbs = pathfilename;
                pathfilenamebbs[pathfilenamebbs.length() - 1] = 's';
                if (_tabsMgr->isActualDiagramComplexBox() == false) {
@@ -713,9 +767,10 @@ void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) {
                wxString fileName = openFileDialog->GetPath();
                ifstream inputStream;
                std::string fName = (const char*) (fileName.mb_str());
+
                inputStream.open(fName.c_str());
+               assert(inputStream.good()); // fails
                _tabsMgr->addNewTab(openFileDialog->GetFilename());
-
                _tabsMgr->loadDiagram(inputStream, fName);
 
                inputStream.close();
@@ -733,12 +788,22 @@ void wxGUIEditorGraphicBBS::OnClickBtnBox(wxCommandEvent& event) {
                std::string packageName = bbDes->GetPackage()->GetName();
 
                wxGEditorTabPanel *pnl = this->_tabsMgr->getActualTabPanel();
-
+               
+               // save empty state!!
+       /*      if (_tabsMgr->getNumActualSelectedObjects() == 0)
+               {
+                       SaveTempActualDiagram();
+               }
+               */
                if (pnl != NULL) {
                        wxVtkSceneManager *scn = pnl->getSceneManager();
                        scn->createGBlackBox(50, 50, packageName, typeName);
                        scn->refresh();
-               } // if pnl
+               }
+               if (GetToolBar()->GetToolEnabled(ID_UNDO) == false)
+                       GetToolBar()->EnableTool(ID_UNDO,true);
+               SaveTempActualDiagram();
+               // if pnl
        }// if bbDes
 }
 
@@ -813,13 +878,13 @@ void wxGUIEditorGraphicBBS::OnHelpBBeditor(wxCommandEvent& event) {
 
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnCreatePackage(wxCommandEvent& event) {
-       printf("EED wxGUIEditorGraphicBBS::OnCreatePackag ... not implemented ..\n");
+
+       bbtkSystemTools::CreatePackage();
 }
 
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnCreateBlackBox(wxCommandEvent& event) {
-       printf(
-                       "EED wxGUIEditorGraphicBBS::OnCreateBlackBox ... not implemented ..\n");
+       bbtkSystemTools::CreateBlackBox();
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event) {