X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FwxVtkClipping3DViewCntrlPanel.cxx;h=da8764c2c9ff569dec6f1d5c16073b0b682015bd;hb=76820b27f1b2256fc0b6849ee77181d46891baa6;hp=7fe9af330ce8851026cd0c45860b392ff205fb44;hpb=78a76d83140ed2adf38b8906f5d9fbfde1186c9a;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
index 7fe9af3..da8764c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
@@ -48,7 +48,6 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
 					_surfC			= new wxRadioButton(panel,-1,_T("C"));
 					_surfD			= new wxRadioButton(panel,-1,_T("D"));
 
-
 	//RaC 03-2010 Divides in two panels thje last tab Surface/Volume
 	//wxCheckBox		*ckVolum		= new wxCheckBox(panel,-1,_T("Vol"));
 	wxCheckBox		*ckBoxSurface	= new wxCheckBox(panel,-1,_T("Surface Box"));
@@ -58,23 +57,20 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
 
 					_color			= new wxButton(panel,-1,_T(""));
 					_visible		= new wxCheckBox(panel,-1,_T("Vis"));
-					_opacity		= new wxSlider(panel,-1,50,0,100, wxDefaultPosition, wxSize(800,40), wxSL_HORIZONTAL | wxSL_LABELS);
+					_opacity		= new wxSlider(panel,-1,50,0,100, wxDefaultPosition, wxSize(100,40), wxSL_HORIZONTAL | wxSL_LABELS);
 
 	wxStaticText	*isoValueTitle	= new wxStaticText(panel,-1,_T("isoValue"));
-					_isoValue		= new wxSlider(panel,-1,2000,110,2000, wxDefaultPosition, wxSize(800,40), wxSL_HORIZONTAL  |  wxSL_AUTOTICKS | wxSL_LABELS);
-
+					_isoValue		= new wxSlider(panel,-1,2000,110,2000, wxDefaultPosition, wxSize(300,40), wxSL_HORIZONTAL  |  wxSL_AUTOTICKS | wxSL_LABELS);
 
 					_wireFrameRep	= new wxRadioButton(panel,-1,_T("WireFrame"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP);
 					_surfaceRep		= new wxRadioButton(panel,-1,_T("Surface"));
 
-
 	double range[2];
 	vtkImageData *vtkimagedata = wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetVtkMPRBaseData()->GetImageData();
 	vtkimagedata->GetScalarRange( range );
 	_isoValue->SetRange( (int)(range[1]*0.1) , (int)(range[1]) );
 	_isoValue->SetValue( (int)(wxvtkclipping3Dview->GetVtkClipping3DDataViewer()->GetIsovalue(0)) );
 
-
 	_isoValue->SetTickFreq(25,0);
 
 	_isoValueSpin	= new wxSlider(panel , -1,5,1,10,wxDefaultPosition , wxSize(25,45), wxSL_VERTICAL | wxSL_AUTOTICKS |wxSL_LEFT  );
@@ -182,11 +178,11 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
 
 
 	sizerH1->Add( _surfA									, 1, wxALL|wxEXPAND, 0);
-	sizerH1->Add( new wxStaticText(panel, -1,_T("  "))			, 1, wxALL|wxEXPAND, 0);
+	sizerH1->Add( new wxStaticText(panel, -1,_T("  "))		, 1, wxALL|wxEXPAND, 0);
 	sizerH1->Add( _surfB									, 1, wxALL|wxEXPAND, 0);
-	sizerH1->Add( new wxStaticText(panel, -1,_T("  "))			, 1, wxALL|wxEXPAND, 0);
+	sizerH1->Add( new wxStaticText(panel, -1,_T("  "))		, 1, wxALL|wxEXPAND, 0);
 	sizerH1->Add( _surfC									, 1, wxALL|wxEXPAND, 0);
-	sizerH1->Add( new wxStaticText(panel, -1,_T("  "))			, 1, wxALL|wxEXPAND, 0);
+	sizerH1->Add( new wxStaticText(panel, -1,_T("  "))		, 1, wxALL|wxEXPAND, 0);
 	sizerH1->Add( _surfD									, 1, wxALL|wxEXPAND, 0);
 	sizerH1->Add( new wxStaticText(panel, -1,_T("          "))	, 1, wxALL|wxEXPAND, 0);
 	sizerH1->Add( ckBoxSurface								, 1, wxALL|wxEXPAND, 0);
@@ -208,13 +204,17 @@ wxVtkClipping3DViewCntrlPanel::wxVtkClipping3DViewCntrlPanel(wxWindow *parent, w
 	sizerH2->Add( _surfaceRep				, 1,wxSHAPED | wxALIGN_CENTER_VERTICAL , 0);
 	sizerH2->Add( new wxStaticText(panel, -1,_T("          "))			, 1, wxALL|wxEXPAND, 0);
 
-	sizerH2->Add( _opacity				, 1, wxALL|wxEXPAND, 0);
 
 
 	sizerH3->Add( isoValueTitle			, 1, wxALL|wxEXPAND, 0);
 	sizerH3->Add( _isoValueSpin			, 1, wxALL|wxEXPAND, 0);
 	sizerH3->Add( _isoValue				, 1, wxALL|wxEXPAND, 0);
 
+	sizerH3->Add( new wxStaticText(panel, -1,_T("      "))			, 1, wxALL|wxEXPAND, 0);
+	sizerH3->Add( new wxStaticText(panel, -1,_T("Opacity:"))			, 1, wxALL|wxEXPAND, 0);
+	sizerH3->Add( _opacity				, 1, wxALL|wxEXPAND, 0);
+
+
 /*
 	sizerH4->Add( ckBoxX		, 1, wxALL|wxEXPAND, 0);
 	sizerH4->Add( text2			, 1, wxALL|wxEXPAND, 0);