X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=ed6f61ff1d8ffdae0e026a46c95ed0c53b3985cb;hb=95b0c39bbfb922f7fb91e87f3459a91ed2323377;hp=816e884350c2dc710aa948b777f98e1e4bf619ea;hpb=be7230c59a3a7d7aa5bfee591b35d31e5e7a93b3;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 816e884..ed6f61f 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -34,6 +34,7 @@ Version:   $Revision$
 */
 
 #include "bbtkwxGUIEditorGraphicBBS.h"
+#include "creaWx.h"
 
 namespace bbtk
 {
@@ -46,28 +47,27 @@ namespace bbtk
 		_frameAUIMgr = new wxAuiManager(this);
 		
 
-		//std::string datadir( crea::System::GetExecutablePath() );
+		/*std::string datadir( crea::System::GetExecutablePath() );
 		std::string datadir (".");
 		cout<<"RaC //------------------"<<endl;
 		cout<<"RaC //TODO wxGUIEditorGraphicBBS constructor.Initialize datadir with  crea::System::GetExecutablePath() ."<<endl;
 		cout<<"RaC //------------------"<<endl;
 
-   	    #ifdef LINUX /* assume this is OSX */
+   	    #ifdef LINUX // assume this is OSX 
  		   datadir=datadir+"/../share/creaContours";
 	    #endif // MACOSX	
 	
-		#ifdef MACOSX /* assume this is OSX */
+		#ifdef MACOSX // assume this is OSX 
 			datadir=datadir+"/../../../../share/creaContours";
 		#endif // MACOSX	
 
-		_dataDir = datadir;
+		_dataDir = datadir;*/
 
 		initMenu();
 		initToolbar();
 		initTabPanelsManager();
 		initPackageBrowser();
 		initHelpHTMLBrowser();
-		initPropertiesPanel();
 
 		CreateStatusBar();
 		_frameAUIMgr->Update();
@@ -84,23 +84,29 @@ namespace bbtk
 
 	//=========================================================================
 	void wxGUIEditorGraphicBBS::initToolbar()
-	{	
-		//std::string filename= _dataDir + "/data/icons/wxart_new.xpm";   
+	{	 
 		wxBitmap bmp_new(new_xpm);
+		wxBitmap bmp_run(run_xpm);
+		wxBitmap bmp_delete(delete_xpm);
+		wxBitmap bmp_centerview(centerview_xpm);
 
 		wxToolBar  *_toolbar = new wxToolBar(this, wxID_ANY);
 
 		//Adds a tool btn to the toolbar
 		_toolbar->AddTool(1000,_T("New"),bmp_new, wxNullBitmap, wxITEM_NORMAL,_T("New tab"), _T("Create a new panel tab"));
-		_toolbar->AddTool(1001,_T("Execute"),bmp_new, wxNullBitmap, wxITEM_NORMAL,_T("Execute actual diagram"), _T("Execute actual diagram"));
+		_toolbar->AddTool(1001,_T("Execute"),bmp_run, wxNullBitmap, wxITEM_NORMAL,_T("Execute actual diagram"), _T("Execute actual diagram"));
+		_toolbar->AddTool(1002,_T("Delete all"),bmp_delete, wxNullBitmap, wxITEM_NORMAL,_T("Delete all boxes"), _T("Delete all boxes"));
+		_toolbar->AddTool(1003,_T("Center view"),bmp_centerview, wxNullBitmap, wxITEM_NORMAL,_T("Center view"), _T("Center view"));
 
 		_toolbar->SetMargins( 2, 2 );
 		_toolbar->Realize();
 		SetToolBar(_toolbar);
 
 		// connect command event handlers
-		Connect(1000,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnToolLeftClick));
-		Connect(1001,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnToolLeftClick));
+		Connect(1000,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCreateNewTab));
+		Connect(1001,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnExecuteActualDiagram));
+		Connect(1002,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnDeleteAllBoxesActualDiagram));
+		Connect(1003,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnCenterViewActualDiagram));
 
 	}
 	//=========================================================================
@@ -153,14 +159,6 @@ namespace bbtk
 
 	//================================================================
 
-	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 '");
@@ -280,26 +278,29 @@ namespace bbtk
 
 	void wxGUIEditorGraphicBBS::editBlackBox(GBlackBoxModel *bbmodel)
 	{
-		wxEditionDialog* dialog = new wxEditionDialog(this,bbmodel);
+		wxBlackBoxEditionDialog* dialog = new wxBlackBoxEditionDialog(this,bbmodel);
 		dialog->Show();
 	}
 
 	//=========================================================================
 
-	void wxGUIEditorGraphicBBS::updateStatusBar(std::string textStatus)
+	void wxGUIEditorGraphicBBS::editDiagramParameters(wxVtkSceneManager* scene)
 	{
-		SetStatusText(_T(textStatus));
+		wxBlackBoxEditionDialog* dialog = new wxBlackBoxEditionDialog(this,scene);
+		dialog->Show();
 	}
 
 	//=========================================================================
 
-	void wxGUIEditorGraphicBBS::executeActualDiagram()
+	void wxGUIEditorGraphicBBS::updateStatusBar(std::string textStatus)
 	{
-		std::string script = _tabsMgr->getActualDiagramScript();
-		cout<<"RaC wxGUIEditorGraphicBBS::executeActualDiagram SCRIPT"<<endl;
-		cout<<script<<endl;
+		SetStatusText(crea::std2wx(textStatus));
+	}
 
+	//=========================================================================
 
+	void wxGUIEditorGraphicBBS::executeScript(std::string script)
+	{
 		std::string separator = ConfigurationFile::GetInstance().Get_file_separator ();
 		std::string dir = ConfigurationFile::GetInstance().Get_default_temp_dir();
 		std::string filename = dir + separator + "tmp_bbtk.bbs";
@@ -316,7 +317,7 @@ namespace bbtk
 		#endif
 
  		//command += ConfigurationFile::GetInstance().Get_bin_path();
-		command +="C:/RaC/CREATIS/bbtkBIN/RelWithDebInfo//";
+		command +="C:/temp/bbtkBIN/RelWithDebInfo//";
 
 		#ifdef MACOSX
 			command += separator + "bbi.app/Contents/MacOS/bbi\" ";
@@ -331,36 +332,53 @@ namespace bbtk
 
 		command += " & ";
 		  
-  		printf ("RaC wxGUIEditorGraphicBBS::executeActualDiagram %s \n" , command.c_str() );
+  		printf ("RaC wxGUIEditorGraphicBBS::executeScript %s \n" , command.c_str() );
    		system( command.c_str() );
 	}
 
+	//=========================================================================
+	// EVENT HANDLERS 
 	//=========================================================================
 
-	/*****************************************************
-	/* HANDLERS 
-	/*****************************************************/
+	void wxGUIEditorGraphicBBS::OnCreateNewTab(wxCommandEvent& event)
+	{
+		_tabsMgr->addNewTab();		
+	}
+
+	//=========================================================================
 
-	void wxGUIEditorGraphicBBS::OnToolLeftClick(wxCommandEvent& event)
+	void wxGUIEditorGraphicBBS::OnExecuteActualDiagram(wxCommandEvent& event)
 	{
-		switch (event.GetId())
-		{
-			case 1000 :
-				_tabsMgr->addNewTab();
-			break;	
+		std::string script = _tabsMgr->getActualDiagramScript();
+		cout<<"RaC wxGUIEditorGraphicBBS::executeActualDiagram SCRIPT"<<endl;
+		cout<<script<<endl;
 
-			case 1001 :
-				executeActualDiagram();
-			break;	
-		}
+		executeScript(script);		
+	}
+
+	//=========================================================================
+
+	void wxGUIEditorGraphicBBS::OnDeleteAllBoxesActualDiagram(wxCommandEvent& event)
+	{
+		_tabsMgr->deleteAllBoxesActualDiagram();
 	}
 
+	//=========================================================================
+
+	void wxGUIEditorGraphicBBS::OnCenterViewActualDiagram(wxCommandEvent& event)
+	{
+		_tabsMgr->centerViewActualDiagram();
+	}
+
+	//=========================================================================
+
 	void wxGUIEditorGraphicBBS::OnExit(wxCommandEvent& event)
 	{
 		Close(true);
 	}
 
 
+
 }  // EO namespace bbtk
 
 // EOF