X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=12708e34400425a58447bfa5a7e9e2f95dca78a3;hb=50851761f4216d932217db8e8fe56dd5aac6b0fb;hp=f2e6e086a58a0aa4986deefee9258e30e904ba5e;hpb=ac7e88cf5991d996435b15c7d731b67078f8b2c9;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index f2e6e08..12708e3 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -66,10 +66,13 @@ namespace bbtk
 		initToolbar();
 		initTabPanelsManager();
 		initPackageBrowser();
-		
+		initHelpHTMLBrowser();
+		initPropertiesPanel();
 
 		CreateStatusBar();
 		_frameAUIMgr->Update();
+		_actualPkgBrowserBoxName="";
+		_actualPkgBrowserPkgName="";
 	}
 
 
@@ -90,25 +93,22 @@ namespace bbtk
 		//Adds a tool btn to the toolbar
 		_toolbar->AddTool(wxID_NEW,_T("New"),bmp_new, wxNullBitmap, wxITEM_NORMAL,_T("New tab"), _T("Create a new panel tab"));
 
-
-		////////////////////
-		// TEMP to avoid drag and drop
-			
-		_toolbar->AddTool(15,_T("New Box"),bmp_new, wxNullBitmap, wxITEM_NORMAL,_T("New Box"), _T("Create a new Box"));
-
-
-		//
-		////////////////////
-
 		_toolbar->SetMargins( 2, 2 );
 		_toolbar->Realize();
 		SetToolBar(_toolbar);
 
 		// connect command event handlers
 		Connect(wxID_NEW,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnToolLeftClick));
-		Connect(15,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnToolLeftClick));
 
 	}
+	//=========================================================================
+	void wxGUIEditorGraphicBBS::initHelpHTMLBrowser()
+	{
+		//TO FIX THE PATH OF BBTK BIN  IN ORDER TO USE REGENERATE EXECUTABLES
+		//RegenerateAll();
+		_helpHtmlBrowser = new WxGUIHtmlBrowser(this,wxSize(200,0));
+		_frameAUIMgr->AddPane(_helpHtmlBrowser,wxAuiPaneInfo().Right().MinSize(200,200));	
+	}
 
 	//=========================================================================
 	void wxGUIEditorGraphicBBS::initMenu()
@@ -121,6 +121,8 @@ namespace bbtk
 		helpMenu->Append(wxID_ABOUT, _T("&About..."), _T("About"));
 		fileMenu->Append(wxID_EXIT, _T("E&xit"), _T("Exit"));
 
+		Connect(wxID_EXIT,wxEVT_COMMAND_MENU_SELECTED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnExit));
+
 		// now append the freshly created menu to the menu bar...
 		wxMenuBar *menuBar = new wxMenuBar();
 		menuBar->Append(fileMenu, _T("&File"));
@@ -133,9 +135,9 @@ namespace bbtk
 	//=========================================================================
 	void wxGUIEditorGraphicBBS::initTabPanelsManager()
 	{
-		wxAuiNotebook *notebook = new wxAuiNotebook(this,wxID_ANY,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(notebook);
-		_frameAUIMgr->AddPane(notebook,wxAuiPaneInfo().CenterPane());	
+		_notebook = new wxAuiNotebook(this,wxID_ANY,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());	
 
 	}
 	
@@ -144,10 +146,136 @@ namespace bbtk
 	{
 		_pkgBrowser = new WxGUIPackageBrowser2(this);
 		_pkgBrowser->IncludeAll();
-		_frameAUIMgr->AddPane(_pkgBrowser,wxAuiPaneInfo().Left().MinSize(200,200).CloseButton(false));	
+		_frameAUIMgr->AddPane(_pkgBrowser,wxAuiPaneInfo().Left().MinSize(200,200).CloseButton(false));		
+	}
+
+	//================================================================
+
+	void wxGUIEditorGraphicBBS::initPropertiesPanel()
+	{
+		_propertiesPanel = new wxPropertiesPanel(this);
+		_frameAUIMgr->AddPane(_propertiesPanel,wxAuiPaneInfo().Right().MinSize(200,200).CloseButton(false).Floatable(false));
+	}
+
+	//================================================================
+
+	void wxGUIEditorGraphicBBS::DoRegeneratePackageDoc( const std::string& pack )
+	{
+		std::string mess("Regenerating doc for package '");
+		if (pack!="-a"){
+			mess += pack + "'";
+		}
+		else
+		{
+			mess = "Regenerating doc for all packages";
+		}
 		
+		mess += " ... please wait";		
+
+		SetStatusText( std2wx(mess) );
+
+		//BBTK_BUSY_CURSOR;
+
+		std::string command;
+		#if defined(WIN32)
+			command = "\"";
+		#endif
+			command += ConfigurationFile::GetInstance().Get_bin_path();
+			command += ConfigurationFile::GetInstance().Get_file_separator();
+			command += "bbRegeneratePackageDoc";
+		#if defined(WIN32)
+			command += "\"";
+		#endif
+
+		command += " " + pack + " -q";
+	    bbtkMessage("debug",1,"Executing system command '"<<command<<"'"<<std::endl);
+
+		if ( ! system ( command.c_str() ) )
+		{
+			SetStatusText( _T("Done !"));
+			/*
+			wxMessageBox(_T("Done !"),_T("Regenerate package '")
+					 +std2wx(pack)+_T("' doc"),
+					 wxOK | wxICON_INFORMATION);
+			*/
+		}
+		else 
+		{
+			SetStatusText( _T("Done !"));
+			wxString err(_T("An error occured while running '"));
+			err +=  bbtk::std2wx(command) + _T("'");
+			wxMessageBox(err,_T("Regenerate package doc"),wxOK | wxICON_ERROR);      
+	    }
 	}
 
+	//================================================================
+	void wxGUIEditorGraphicBBS::DoRegenerateBoxesLists()
+	{
+		SetStatusText( _T("Regenerating boxes lists ... please wait") );
+		//BBTK_BUSY_CURSOR ;
+
+		std::string command;
+		#if defined(WIN32)
+			command = "\"";
+		#endif
+			command += ConfigurationFile::GetInstance().Get_bin_path();
+			command += ConfigurationFile::GetInstance().Get_file_separator();
+			command += "bbRegenerateBoxesLists";
+
+		#if defined(WIN32)
+			command += "\"";
+		#endif
+			command += " -q";
+
+		bbtkMessage("debug",1,"Executing system command '"<<command<<"'"<<std::endl);
+
+		if ( ! system ( command.c_str() ) )
+		{
+			SetStatusText( _T("Done !"));
+			/*
+			wxMessageBox(_T("Done !"),_T("Regenerate boxes lists"),
+					 wxOK | wxICON_INFORMATION);
+			*/
+		}
+		else 
+		{
+			SetStatusText( _T("Done !"));
+			wxString err(_T("An error occured while running '"));
+			err +=  bbtk::std2wx(command) + _T("'");
+			wxMessageBox(err,_T("Regenerate boxes lists"),wxOK | wxICON_ERROR);      
+		}
+	}
+	
+  //================================================================
+	void wxGUIEditorGraphicBBS::RegenerateAll()
+	{
+		DoRegeneratePackageDoc("-a");	
+		DoRegenerateBoxesLists();
+	}
+
+	//================================================================
+
+	wxAuiNotebook* wxGUIEditorGraphicBBS::getAuiNotebook()
+	{
+		return _notebook;
+	}
+
+	//================================================================
+
+	void wxGUIEditorGraphicBBS::displayBlackBoxInfo(std::string packageName, std::string boxName)
+	{
+		if(_actualPkgBrowserPkgName != packageName || _actualPkgBrowserBoxName != boxName )
+		{
+			_actualPkgBrowserPkgName = packageName;
+			_actualPkgBrowserBoxName = boxName;
+
+			BlackBoxDescriptor::Pointer descriptor = GObjectsMVCFactory::getInstance()->getBlackBoxDescriptor(packageName, boxName);
+			_pkgBrowser->WxGUIBlackBoxListUserOnSelected(descriptor.get());
+		}
+	}
+
+	//=========================================================================
+
 	/*****************************************************
 	/* HANDLERS 
 	/*****************************************************/
@@ -157,16 +285,16 @@ namespace bbtk
 		switch (event.GetId())
 		{
 		case wxID_NEW :
-			std::cout<<"RaC New"<<std::endl;
 			_tabsMgr->addNewTab();
-			break;
-		case 15 :
-			BlackBoxDescriptor* desc = _pkgBrowser->GetActualSelected();
-			cout<<"RaC GetActualSelected desc:"<<desc->GetAuthor()<<endl;
-
+			break;			
 		}
 	}
 
+	void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event)
+	{
+		Close(true);
+	}
+
 
 }  // EO namespace bbtk