X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FEditorGraphicBBS%2FbbsWxGUIEditorGraphic%2FbbtkwxGUIEditorGraphicBBS.cxx;h=bea7df0f96c42e0b36e4405c92f0b3e81192ab22;hb=062ee1e352a911991a120c5bf95ba836a6b0871b;hp=8d8c5774f5e74919c41593bcaecc8b19f479750a;hpb=aba99a619bc99b4a4e58267f700958d4745659bf;p=bbtkGEditor.git

diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 8d8c577..bea7df0 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -67,9 +67,12 @@ namespace bbtk
 		initTabPanelsManager();
 		initPackageBrowser();
 		initHelpHTMLBrowser();
+		initPropertiesPanel();
 
 		CreateStatusBar();
 		_frameAUIMgr->Update();
+		_actualPkgBrowserBoxName="";
+		_actualPkgBrowserPkgName="";
 	}
 
 
@@ -88,31 +91,23 @@ namespace bbtk
 		wxToolBar  *_toolbar = new wxToolBar(this, wxID_ANY);
 
 		//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->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->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));
+		Connect(1000,wxEVT_COMMAND_TOOL_CLICKED,wxCommandEventHandler(wxGUIEditorGraphicBBS::OnToolLeftClick));
+		Connect(1001,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));	
 	}
@@ -142,9 +137,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());	
 
 	}
 	
@@ -156,6 +151,184 @@ namespace bbtk
 		_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());
+		}
+	}
+
+	//=========================================================================
+
+	void wxGUIEditorGraphicBBS::updateStatusBar(std::string textStatus)
+	{
+		SetStatusText(_T(textStatus));
+	}
+
+	//=========================================================================
+
+	void wxGUIEditorGraphicBBS::executeActualDiagram()
+	{
+		std::string script = _tabsMgr->getActualDiagramScript();
+		cout<<"RaC wxGUIEditorGraphicBBS::executeActualDiagram SCRIPT"<<endl;
+		cout<<script<<endl;
+
+
+		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";
+		
+		ofstream tempFile;
+		tempFile.open(filename.c_str());
+		tempFile << script;
+		tempFile.close();
+		
+		std::string command = "\"";
+
+		#ifdef WIN32
+			command += "\"";
+		#endif
+
+ 		//command += ConfigurationFile::GetInstance().Get_bin_path();
+		command +="C:/RaC/CREATIS/bbtkBIN/RelWithDebInfo//";
+
+		#ifdef MACOSX
+			command += separator + "bbi.app/Contents/MacOS/bbi\" ";
+		#else 
+			command += separator + "bbi\" ";
+		#endif
+		command += "\""+filename + "\"";
+
+		#ifdef WIN32
+			command += "\"";
+		#endif
+
+		command += " & ";
+		  
+  		printf ("RaC wxGUIEditorGraphicBBS::executeActualDiagram %s \n" , command.c_str() );
+   		system( command.c_str() );
+	}
+
+	//=========================================================================
+
 	/*****************************************************
 	/* HANDLERS 
 	/*****************************************************/
@@ -164,13 +337,13 @@ namespace bbtk
 	{
 		switch (event.GetId())
 		{
-		case wxID_NEW :
-			std::cout<<"RaC New"<<std::endl;
-			_tabsMgr->addNewTab();
-			break;
-		case 15 :
-			BlackBoxDescriptor* desc = _pkgBrowser->GetActualSelected();
-			
+			case 1000 :
+				_tabsMgr->addNewTab();
+			break;	
+
+			case 1001 :
+				executeActualDiagram();
+			break;	
 		}
 	}