X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxMaracasSurfaceRenderingProp3D.cxx;h=8b8cf8b97f0e5237f3380f88a7913cf93c170a39;hb=ae196719490130990cdde501c982c3370b46b21c;hp=57dc2983e63d143c6b3108484e7b5b7a93b3b7ce;hpb=fc309690300a29fbfbac04f6fdf72783202617ad;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
index 57dc298..8b8cf8b 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxMaracasSurfaceRenderingProp3D.cxx
@@ -54,15 +54,18 @@ void wxMaracasSurfaceRenderingProp3D::createControls(){
 		checkbox = new  wxCheckBox(this,-1,wxString(_T("Show Actor")));
 		Connect(checkbox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onCheckBoxChange);	
 		checkbox->SetValue(true);	
-		checkboxsizer->Add(checkbox,wxFIXED_MINSIZE);
-		/*
-		checkboxsurface = new  wxCheckBox(this,-1,wxString(_T("Surface Box")));
-		Connect(checkboxsurface->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onCheckBoxSurfaceChange);	
-		checkboxsurface->SetValue(true);
-		checkboxsizer->Add(checkboxsurface,wxFIXED_MINSIZE);
-		*/
-
-		sizersurfprop->Add(checkboxsizer,wxFIXED_MINSIZE);
+		checkboxsizer->Add(checkbox,1, wxGROW);
+
+
+		if(wxMaracasSurfaceRendering::getInstance()->interactorSet()){
+			checkboxsurface = new  wxCheckBox(this,-1,wxString(_T("Surface Box")));
+			Connect(checkboxsurface->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onCheckBoxSurfaceChange);	
+			checkboxsurface->SetValue(true);
+			checkboxsizer->Add(checkboxsurface,1, wxGROW);
+		}	
+
+
+		sizersurfprop->Add(checkboxsizer,1, wxGROW);
 	}
 
 	//this->addControl(checkbox);	
@@ -71,7 +74,7 @@ void wxMaracasSurfaceRenderingProp3D::createControls(){
 	wxBitmap bitmap(Color_xpm);
 	_colorchoose = new wxBitmapButton(this, -1, bitmap,wxDefaultPosition,wxSize(30,30));	
 	Connect(_colorchoose->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onColorChange);			
-	sizerbut->Add(_colorchoose,wxFIXED_MINSIZE);
+	sizerbut->Add(_colorchoose,1, wxGROW);
 
 	/*
 	wxBitmap bitmap1(Add_xpm);
@@ -79,7 +82,7 @@ void wxMaracasSurfaceRenderingProp3D::createControls(){
 	Connect(_viewimage->GetId(), wxEVT_COMMAND_BUTTON_CLICKED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onViewImage);			
 	sizerbut->Add(_viewimage,wxFIXED_MINSIZE);
 	*/
-	sizersurfprop->Add(sizerbut,wxFIXED_MINSIZE);
+	sizersurfprop->Add(sizerbut,1, wxGROW);
 	//sizercolor->Add(checkbox,wxFIXED_MINSIZE);
 	//sizercolor->Add(_colorchoose,wxFIXED_MINSIZE);
 	//this->addControl(sizercolor);
@@ -88,10 +91,10 @@ void wxMaracasSurfaceRenderingProp3D::createControls(){
 	opacity = new wxSlider(this, -1,100,0,100,wxDefaultPosition,wxDefaultSize,wxSL_HORIZONTAL|wxSL_LABELS);	
 	Connect(opacity->GetId(), wxEVT_SCROLL_CHANGED, (wxObjectEventFunction)&wxMaracasSurfaceRenderingProp3D::onOpacityRelease);	
 	wxFlexGridSizer* sizeropacity = new wxFlexGridSizer(1,1,1);	
-	sizeropacity->Add(label,wxFIXED_MINSIZE);
-	sizeropacity->Add(opacity,wxFIXED_MINSIZE);
+	sizeropacity->Add(label,1, wxGROW);
+	sizeropacity->Add(opacity,1, wxGROW);
 
-	sizersurfprop->Add(sizeropacity,wxFIXED_MINSIZE);
+	sizersurfprop->Add(sizeropacity,1, wxGROW);
 
 	this->addControl(sizersurfprop);