X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=3b6641effcea4a1e27d372e08e8f952c36781e2e;hb=567028f33d052a54225024906cce14dc1558162f;hp=bf26a19399977d21321a5aa5325c7d5a6000586a;hpb=0846876a83badbcceaa83f3e1562ef1708e0d7e0;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index bf26a19..3b6641e 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -36,6 +36,8 @@
 #include "bbtkwxGUIEditorGraphicBBS.h"
 #include "creaWx.h"
 #include "creaSystem.h"
+//must go #include "bbtkUtilities.h"
+//must go #include "bbtkConfigurationFile.h"
 #include <wx/defs.h>
 
 #include <InterpreterBBS.h>
@@ -108,6 +110,7 @@ void wxGUIEditorGraphicBBS::initToolbar() {
 	wxBitmap bmp_complexoutputport(complexoutputport_xpm);
 	wxBitmap bmp_undo(undo_xpm);
 	wxBitmap bmp_redo(redo_xpm);
+	wxBitmap bmp_editProperties(editProperties_xpm);
 	wxToolBar *toolbar = new wxToolBar(this, wxID_ANY);
 
 	//Adds a tool btn to the toolbar
@@ -147,8 +150,11 @@ void wxGUIEditorGraphicBBS::initToolbar() {
 	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->AddSeparator();
+	toolbar->AddTool(ID_EDIT, _T("Edit diagram properties"),bmp_editProperties, wxNullBitmap, wxITEM_NORMAL,	_T("Edit diagram properties"), _T("Edit diagram properties"));
+	
+	toolbar->EnableTool(ID_UNDO, false);
+	toolbar->EnableTool(ID_REDO, false);
 	toolbar->SetMargins(2, 2);
 	toolbar->Realize();
 	SetToolBar(toolbar);
@@ -190,6 +196,8 @@ void wxGUIEditorGraphicBBS::initToolbar() {
 			wxCommandEventHandler(wxGUIEditorGraphicBBS::OnAddComplexBoxOutput));
 	Connect(ID_UNDO,wxEVT_COMMAND_TOOL_CLICKED,	wxCommandEventHandler(wxGUIEditorGraphicBBS::OnUndo));
 	Connect(ID_REDO,wxEVT_COMMAND_TOOL_CLICKED,	wxCommandEventHandler(wxGUIEditorGraphicBBS::OnRedo));
+	Connect(ID_CHANGENAME, wxEVT_COMMAND_RIGHT_CLICK, wxCommandEventHandler(wxGUIEditorGraphicBBS::OnChangeName));
+	Connect(ID_EDIT,wxEVT_COMMAND_TOOL_CLICKED,	wxCommandEventHandler(wxGUIEditorGraphicBBS::OnEditDiagramProperties));
 
 }
 //=========================================================================
@@ -210,7 +218,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"));
@@ -287,27 +297,28 @@ void wxGUIEditorGraphicBBS::initMenu() {
 }
 
 //=========================================================================
-void wxGUIEditorGraphicBBS::initTabPanelsManager() {
+void wxGUIEditorGraphicBBS::initTabPanelsManager() 
+{
 	_notebook = new wxAuiNotebook(this, wxID_NOTEBOOK, wxDefaultPosition,
 			wxDefaultSize, wxAUI_NB_TOP | wxAUI_NB_TAB_MOVE
 					| wxAUI_NB_CLOSE_ON_ACTIVE_TAB | wxAUI_NB_TAB_FIXED_WIDTH
 					| wxAUI_NB_WINDOWLIST_BUTTON);
 	_tabsMgr = new wxTabPanelsManager(this);
 	_frameAUIMgr->AddPane(_notebook, wxAuiPaneInfo().CenterPane());
-
 }
 
 //=========================================================================
-void wxGUIEditorGraphicBBS::initPackageBrowser() {
+void wxGUIEditorGraphicBBS::initPackageBrowser() 
+{
 	_pkgBrowser = new WxGUIPackageBrowser2(this);
 	_pkgBrowser->IncludeAll();
-	_frameAUIMgr->AddPane(_pkgBrowser,
-			wxAuiPaneInfo().Left().MinSize(200, 200).CloseButton(false));
+	_frameAUIMgr->AddPane(_pkgBrowser, wxAuiPaneInfo().Left().MinSize(30, 500).BestSize(750,500).CloseButton(false));
 }
 
 //================================================================
 
-void wxGUIEditorGraphicBBS::DoRegeneratePackageDoc(const std::string& pack) {
+void wxGUIEditorGraphicBBS::DoRegeneratePackageDoc(const std::string& pack) 
+{
 	std::string mess("Regenerating doc for package '");
 	if (pack != "-a") {
 		mess += pack + "'";
@@ -422,6 +433,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));
 }
@@ -483,19 +501,59 @@ void wxGUIEditorGraphicBBS::OnCreateNewTab(wxCommandEvent& event) {
 
 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);
+	std::string stundo;
+	std::string stredo;
+
+	_tabsMgr->loadTempDiagram(0);
+	disable = _tabsMgr->getUndoState(stundo);
+	if(disable == 0)
+	{
+		std::string name = _tabsMgr->GetNameTabPanel();
+		if(name[name.length() - 1] == '*')
+		{
+			name =name.substr(0,name.length()-1);
+		}
+		_tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
+	}
+
+	GetToolBar()->EnableTool(ID_UNDO,disable);
+	GetToolBar()->SetToolShortHelp(ID_UNDO,crea::std2wx(stundo));
+	GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState(stredo));
+	GetToolBar()->SetToolShortHelp(ID_REDO,crea::std2wx(stredo));
 	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);
+	std::string stundo;
+	std::string stredo;
+
+	_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(stundo));
+	GetToolBar()->SetToolShortHelp(ID_UNDO,crea::std2wx(stundo));
+	GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState(stredo));
+	GetToolBar()->SetToolShortHelp(ID_REDO,crea::std2wx(stredo));
 	refreshGUIControls();
 }
+
+void wxGUIEditorGraphicBBS::OnChangeName(wxCommandEvent& event){
+}
+
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::OnEditDiagramProperties(wxCommandEvent& event)
+{
+	wxDiagramPropertiesEditionDialog* dialog =
+				new wxDiagramPropertiesEditionDialog(this);
+	dialog->Show();
+}
+
 //=========================================================================
 
 void wxGUIEditorGraphicBBS::OnExecuteActualDiagram(wxCommandEvent& event) {
@@ -539,7 +597,7 @@ void wxGUIEditorGraphicBBS::SaveActualBBS(std::string filename) {
 	std::string content = "";
 	// writing file header
 	content += "# ----------------------------------\n";
-	content += "# - BBTKGEditor v 1.2 BBS BlackBox Script\n";
+	content += "# - BBTKGEditor v 1.3 BBS BlackBox Script\n";
 	content += "# - ";
 	content += filename;
 	content += "\n";
@@ -599,7 +657,7 @@ void wxGUIEditorGraphicBBS::SaveActualComplexBox(std::string filename) {
 
 	// writing file header
 	content += "# ----------------------------------\n";
-	content += "# - BBTKGEditor v 1.2 BBS BlackBox Script (Complex Box)\n";
+	content += "# - BBTKGEditor v 1.3 BBS BlackBox Script (Complex Box)\n";
 	content += "# - ";
 	content += filename;
 	content += "\n";
@@ -634,7 +692,7 @@ void wxGUIEditorGraphicBBS::SaveActualDiagram(std::string filename) {
 
 	// writing file header
 	content += "# ----------------------------------\n";
-	content += "# - BBTKGEditor v 1.2 BBG BlackBox Diagram file\n";
+	content += "# - BBTKGEditor v 1.3 BBG BlackBox Diagram file\n";
 	content += "# - ";
 
 	content += filename;
@@ -650,9 +708,19 @@ void wxGUIEditorGraphicBBS::SaveActualDiagram(std::string filename) {
 }
 
 //=========================================================================
-void wxGUIEditorGraphicBBS::SaveTempActualDiagram() 
+void wxGUIEditorGraphicBBS::SaveTempActualDiagram(const std::string &action) 
 {
-	_tabsMgr->saveTempActualDiagram();
+	std::string stundo;
+	std::string stredo;
+	std::string name = _tabsMgr->GetNameTabPanel();
+	if(name[name.length() - 1] != '*')
+		name +="*";
+	_tabsMgr->SetNameTabPanel(wxString (name.c_str(), wxConvUTF8));
+	_tabsMgr->saveTempActualDiagram(action);
+	GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState(stundo));
+	GetToolBar()->SetToolShortHelp(ID_UNDO,crea::std2wx(stundo));
+	GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState(stredo));
+	GetToolBar()->SetToolShortHelp(ID_REDO,crea::std2wx(stredo));
 }
 
 //=========================================================================
@@ -696,8 +764,14 @@ void wxGUIEditorGraphicBBS::OnSaveActualDiagram(wxCommandEvent& event) {
 	} else {
 		std::string pathfilenamebbs = pathfilename;
 		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 {
@@ -715,6 +789,8 @@ void wxGUIEditorGraphicBBS::OnSaveAsActualDiagram(wxCommandEvent& event) {
 //=========================================================================
 
 void wxGUIEditorGraphicBBS::refreshGUIControls() {
+	std::string stundo;
+	std::string stredo;
 	wxToolBar* toolbar = GetToolBar();
 	if (_tabsMgr->isActualDiagramComplexBox()) {
 		toolbar->ToggleTool(ID_BTNCOMPLEXBOX, true);
@@ -732,6 +808,11 @@ void wxGUIEditorGraphicBBS::refreshGUIControls() {
 		GetMenuBar()->GetMenu(0)->Enable(ID_SAVE_AS_BBS, true);
 	}
 
+	GetToolBar()->EnableTool(ID_UNDO,_tabsMgr->getUndoState(stundo));
+	GetToolBar()->SetToolShortHelp(ID_UNDO,crea::std2wx(stundo));
+	GetToolBar()->EnableTool(ID_REDO,_tabsMgr->getRedoState(stredo));
+	GetToolBar()->SetToolShortHelp(ID_REDO,crea::std2wx(stredo));
+
 	if (_tabsMgr->getNumActualSelectedObjects() > 0) {
 		GetMenuBar()->GetMenu(1)->Enable(ID_COPY_TO_COMPLEXDIAGRAM, true);
 	} else {
@@ -764,6 +845,7 @@ void wxGUIEditorGraphicBBS::OnCenterViewActualDiagram(wxCommandEvent& event) {
 void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) {
 	wxFileDialog * openFileDialog = new wxFileDialog(this, wxT("Open diagram"),
 			wxEmptyString, wxT(""), wxT("*.bbg"), wxOPEN | wxFILE_MUST_EXIST);
+	printf("SCP: wxGUIEditorGraphicBBS::OnOpenDiagram  \n");
 	if (openFileDialog->ShowModal() == wxID_OK) {
 		wxString fileName = openFileDialog->GetPath();
 		ifstream inputStream;
@@ -773,7 +855,9 @@ void wxGUIEditorGraphicBBS::OnOpenDiagram(wxCommandEvent& event) {
 		assert(inputStream.good()); // fails
 		_tabsMgr->addNewTab(openFileDialog->GetFilename());
 		_tabsMgr->loadDiagram(inputStream, fName);
-
+		_tabsMgr->saveTempActualDiagram("load diagram");
+		GetToolBar()->EnableTool(ID_UNDO, false);
+		GetToolBar()->EnableTool(ID_UNDO, false);
 		inputStream.close();
 	}
 	refreshGUIControls();
@@ -790,20 +874,14 @@ 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();
+
+		SaveTempActualDiagram("New Box");
 		// if pnl
 	}// if bbDes
 }
@@ -889,7 +967,56 @@ void wxGUIEditorGraphicBBS::OnCreateBlackBox(wxCommandEvent& event) {
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnPlugPackage(wxCommandEvent& event) {
-	printf("EED wxGUIEditorGraphicBBS::OnPlugPackage ... not implemented ..\n");
+	//printf("EED wxGUIEditorGraphicBBS::OnPlugPackage ... not implemented ..\n");
+	//this is the right code but it's left to include the corresponding commented libraries
+	long style = wxDD_DEFAULT_STYLE | wxDD_DIR_MUST_EXIST;
+	wxDirDialog* FD =
+	  new wxDirDialog( 0,
+			   _T("Select package directory"),
+			   _T(""),
+			   style);
+	long userResponse;
+	do
+	{
+		userResponse = FD->ShowModal();
+		if(userResponse==wxID_OK)
+		{
+			std::string path = wx2std (FD->GetPath()) ;
+			std::string fname = path + "/bbtkPackage";
+			std::cout << "Path chosen = \"" << FD->GetPath() << "\"" << std::endl;
+			if ( Utilities::FileExists( fname ) )
+			{
+				std::ifstream f;
+				f.open(fname.c_str());
+				std::string pname;
+				f >> pname;
+				f.close();
+
+				bbtk::ConfigurationFile::GetInstance().AddPackagePathsAndWrite( path );
+
+				DoRegeneratePackageDoc(pname);
+				DoRegenerateBoxesLists();
+
+				_pkgBrowser->RebuildList();
+
+				wxMessageBox(_T("Package successfully plugged. Please restart bbEditor to see the new package in the package browser."),_T("Plug package"),wxOK | wxICON_INFORMATION);
+				userResponse = wxID_CANCEL;
+			}
+			else
+			{
+				std::string err = "The directory \"" + path + "\" does not contain a 'bbtkPackage' file.";
+				#ifndef WIN32
+					#ifndef MACOSX
+						err += "\nNote: If you are on Linux please select the folder and click \"Open\", don't enter in it.";
+					#endif
+				#endif
+
+
+				wxMessageBox(_T(err),_T("Plug package"),wxOK | wxICON_ERROR);
+			}
+		}
+	}while(userResponse != wxID_CANCEL);
+
 }
 //=========================================================================
 void wxGUIEditorGraphicBBS::OnEditConfig(wxCommandEvent& event) {
@@ -921,10 +1048,51 @@ void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event) {
 	Close(true);
 }
 
+//=========================================================================
+
+
+void wxGUIEditorGraphicBBS::setCurrentDiagramDescription(std::string description)
+{
+	_tabsMgr->SetDescription(description);
+}
+
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::setCurrentDiagramAuthor(std::string author)
+{
+	_tabsMgr->SetAuthor(author);
+}
+
+//=========================================================================
+
+void wxGUIEditorGraphicBBS::setCurrentDiagramCategory(std::string category)
+{
+	_tabsMgr->SetCategory(category);
+}
+
+//=========================================================================
+
+std::string wxGUIEditorGraphicBBS::getCurrentDiagramDescription()
+{
+	return _tabsMgr->GetDescription();
+}
+
+//=========================================================================
 
+std::string wxGUIEditorGraphicBBS::getCurrentDiagramAuthor()
+{
+	return _tabsMgr->GetAuthor();
+}
 
 //=========================================================================
 
+
+std::string wxGUIEditorGraphicBBS::getCurrentDiagramCategory()
+{
+	return _tabsMgr->GetCategory();
+}
+
+
 } // EO namespace bbtk
 
 // EOF