X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=9f68cef04367407fe1f72d64ecfc9a647ca45233;hb=fb950461b1d139c1ec6ab2ac7a33570c0c63fd61;hp=25c4298571c017fe73111c325ae3b4d81f171053;hpb=50438aabbaf55c55e5cab40cb88e19da2a26b0a3;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 25c4298..9f68cef 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -512,6 +512,10 @@ void wxGUIEditorGraphicBBS::OnUndo(wxCommandEvent& event) {
 void wxGUIEditorGraphicBBS::OnRedo(wxCommandEvent& event) {
 	unsigned short disable;
 	_tabsMgr->loadTempDiagram(1);
+	std::string name = _tabsMgr->GetNameTabPanel();
+	if(name[name.length() - 1] != '*')
+		name +="*";
+	_tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
 	GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState());
 	GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState());
 	refreshGUIControls();
@@ -680,6 +684,8 @@ void wxGUIEditorGraphicBBS::SaveTempActualDiagram()
 		name +="*";
 	_tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
 	_tabsMgr->saveTempActualDiagram();
+	GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState());
+	GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState());
 }
 
 //=========================================================================
@@ -803,7 +809,9 @@ void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) {
 		assert(inputStream.good()); // fails
 		_tabsMgr->addNewTab(openFileDialog->GetFilename());
 		_tabsMgr->loadDiagram(inputStream, fName);
-
+		_tabsMgr->saveTempActualDiagram();
+		GetToolBar()->EnableTool(ID_UNDO, false);
+		GetToolBar()->EnableTool(ID_UNDO, false);
 		inputStream.close();
 	}
 	refreshGUIControls();
@@ -820,19 +828,13 @@ void wxGUIEditorGraphicBBS::OnClickBtnBox(wxCommandEvent& event) {
 
 		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 (GetToolBar()->GetToolEnabled(ID_UNDO) == false)
-			GetToolBar()->EnableTool(ID_UNDO,true);
+
 		SaveTempActualDiagram();
 		// if pnl
 	}// if bbDes
@@ -910,12 +912,12 @@ void wxGUIEditorGraphicBBS::OnHelpBBeditor(wxCommandEvent& event) {
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnCreatePackage(wxCommandEvent& event) {
 
-	bbtkSystemTools::CreatePackage();
+	//bbtkSystemTools::CreatePackage();
 }
 
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnCreateBlackBox(wxCommandEvent& event) {
-	bbtkSystemTools::CreateBlackBox();
+	//bbtkSystemTools::CreateBlackBox();
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event) {