From: corredor <>
Date: Wed, 5 May 2010 15:08:28 +0000 (+0000)
Subject: Changements minimals
X-Git-Tag: v1_0_0~82
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=95b0c39bbfb922f7fb91e87f3459a91ed2323377;p=bbtkGEditor.git

Changements minimals
---

diff --git a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
index 57a0358..24099d8 100644
--- a/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
+++ b/lib/EditorGraphicBBS/bbsKernelEditorGraphic/wxVtkSceneManager.cxx
@@ -947,10 +947,8 @@ namespace bbtk
 	{
 		double temp[3];
 		_baseView->GetRenderer()->GetActiveCamera()->GetFocalPoint(temp);
-		printf("RaC wxVtkSceneManager::deleteAllBoxes() GetFocalPoint x:%f y:%f z:%f \n",temp[0],temp[1],temp[2]);
 		_baseView->GetRenderer()->GetActiveCamera()->SetFocalPoint(0,0,temp[2]);
 		_baseView->GetRenderer()->GetActiveCamera()->GetPosition(temp);
-		printf("RaC wxVtkSceneManager::deleteAllBoxes() GetPosition x:%f y:%f z:%f \n",temp[0],temp[1],temp[2]);
 		_baseView->GetRenderer()->GetActiveCamera()->SetPosition(0,0,temp[2]);
 		_baseView->RefreshView();
 
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
index 8d63e0d..ed6f61f 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/bbtkwxGUIEditorGraphicBBS.cxx
@@ -47,21 +47,21 @@ 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();
diff --git a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
index fdde6ad..db284eb 100644
--- a/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
+++ b/lib/EditorGraphicBBS/bbsWxGUIEditorGraphic/wxBlackBoxEditionDialog.cxx
@@ -150,8 +150,12 @@ namespace bbtk
 
 		for(int i=0;i<_lstValues.size();i++)
 		{
-			std::string text = wx2std(_lstValues[i]->GetLabelText());		
-			_model->setValueToInputPort(i,text);
+			std::string text = wx2std(_lstValues[i]->GetLabelText());
+			//TOFIX Search a better alternative
+			if(text!="--No editable--" && text!="--Port Connected--")
+			{
+				_model->setValueToInputPort(i,text);
+			}
 		}
 
 		Close(true);