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=b90d2dce776b27c95bd59251ee83d10a42b0cae5;hp=442fa095df3306498fd23d84e10224641338934b;hpb=a236b3d0da0e436f9027b701df86c3576e9c25fe;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
index 442fa09..da8764c 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/wxVtkClipping3DViewCntrlPanel.cxx
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 
 #include "wxVtkClipping3DViewCntrlPanel.h"
 #include "wx/colordlg.h"
@@ -23,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"));
@@ -33,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  );
@@ -157,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);
@@ -183,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);
@@ -342,8 +367,9 @@ void wxVtkClipping3DViewCntrlPanel::OnVisibleBoxSurface(wxCommandEvent& event)
 //-------------------------------------------------------------------
 void wxVtkClipping3DViewCntrlPanel::OnVisibleBoxVolume(wxCommandEvent& event)
 {
-	//_wxvtkclipping3Dview->SetVisibleBoxVolume(event.IsChecked() );
-	this->BoundingBoxChanged(event.IsChecked());
+printf("EED ERROR JPReyes wxVtkClipping3DViewCntrlPanel::OnVisibleBoxVolume  calling 	_wxvtkclipping3Dview->SetVisibleBoxVolume that not exists ...");
+//EED01July2011	_wxvtkclipping3Dview->SetVisibleBoxVolume(event.IsChecked() );
+	//this->BoundingBoxChanged(event.IsChecked());
 	_wxvtkclipping3Dview->Refresh();
 }
 //-------------------------------------------------------------------