X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=a21ee894291bd5b478bbd08c7ecb55de81f76ded;hb=27e3325d47885b491198917840e8162c234a1545;hp=af24586bf94ea1e451900fdbf7e6a69b38b866c4;hpb=04884fa171fe877e5c2ca53d11d6838bc1f8a8f7;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index af24586..a21ee89 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -210,7 +210,9 @@ void wxGUIEditorGraphicBBS::initMenu() {
 	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"));
+        // CM
+	fileMenu->Append(ID_OPEN, _T("Open a diagram"), _T("Open a diagram"));
+        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"));
@@ -302,7 +304,7 @@ void wxGUIEditorGraphicBBS::initPackageBrowser() {
 	_pkgBrowser = new WxGUIPackageBrowser2(this);
 	_pkgBrowser->IncludeAll();
 	_frameAUIMgr->AddPane(_pkgBrowser,
-			wxAuiPaneInfo().Left().MinSize(200, 200).CloseButton(false));
+			wxAuiPaneInfo().Left().MinSize(480, 400).CloseButton(false));
 }
 
 //================================================================
@@ -422,6 +424,13 @@ void wxGUIEditorGraphicBBS::editBlackBox(GBlackBoxModel *bbmodel) {
 
 //=========================================================================
 
+bool wxGUIEditorGraphicBBS::boxNameExists(std::string boxname) {
+ 
+ 	return this->_tabsMgr->getActualTabPanel()->getSceneManager()->boxExist(boxname);
+}
+
+//=========================================================================
+
 void wxGUIEditorGraphicBBS::updateStatusBar(std::string textStatus) {
 	SetStatusText(crea::std2wx(textStatus));
 }
@@ -492,7 +501,7 @@ void wxGUIEditorGraphicBBS::OnUndo(wxCommandEvent& event) {
 		{
 			name =name.substr(0,name.length()-1);
 		}
-		_tabsMgr->SetNameTabPanel(name);
+		_tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
 	}
 
 	GetToolBar()->EnableTool(ID_UNDO,disable);
@@ -503,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();
@@ -669,8 +682,10 @@ void wxGUIEditorGraphicBBS::SaveTempActualDiagram()
 	std::string name = _tabsMgr->GetNameTabPanel();
 	if(name[name.length() - 1] != '*')
 		name +="*";
-	_tabsMgr->SetNameTabPanel(name);
+	_tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
 	_tabsMgr->saveTempActualDiagram();
+	GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState());
+	GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState());
 }
 
 //=========================================================================
@@ -716,6 +731,12 @@ void wxGUIEditorGraphicBBS::OnSaveActualDiagram(wxCommandEvent& event) {
 		pathfilenamebbs[pathfilenamebbs.length() - 1] = 's';
 		
 		if (_tabsMgr->isActualDiagramComplexBox() == false) {
+			std::string name = _tabsMgr->GetNameTabPanel();
+			if(name[name.length() - 1] == '*')
+			{
+				name =name.substr(0,name.length()-1);
+			}
+			_tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
 			SaveActualDiagram(pathfilename);
 			SaveActualBBS(pathfilenamebbs);
 		} else {
@@ -794,7 +815,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();
@@ -811,19 +834,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
@@ -901,12 +918,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) {