X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2FCutModule%2Finterface%2FCutModelView.cxx;h=265d327d3a6ffa9562cd0a30f3840144f260589c;hb=25e3adf442d6a8d357d52410267445c54426c525;hp=b95a815a835d42ac0b41e937c5801eccf33aaead;hpb=0949d9991131d8fde35ab5fdd41a50a43a0dfd7f;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/CutModule/interface/CutModelView.cxx b/lib/maracasVisuLib/src/CutModule/interface/CutModelView.cxx
index b95a815..265d327 100644
--- a/lib/maracasVisuLib/src/CutModule/interface/CutModelView.cxx
+++ b/lib/maracasVisuLib/src/CutModule/interface/CutModelView.cxx
@@ -1,10 +1,35 @@
+/*# ---------------------------------------------------------------------
+#
+# 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.
+# ------------------------------------------------------------------------ */
+
 /*=========================================================================
 
   Program:   wxMaracas
   Module:    $RCSfile: CutModelView.cxx,v $
   Language:  C++
-  Date:      $Date: 2009/09/01 14:01:35 $
-  Version:   $Revision: 1.2 $
+  Date:      $Date: 2012/11/15 14:16:20 $
+  Version:   $Revision: 1.4 $
 
   Copyright: (c) 2002, 2003
   License:
@@ -86,8 +111,8 @@ wxSizer* CutModelView::getBoxControls(wxWindow* parent,double* range){
 	_sliderrange = new wxSlider(parent, -1, range[0],range[0],range[1],wxDefaultPosition,wxDefaultSize,wxSL_LABELS|wxSL_SELRANGE);
 	wxBoxSizer* sizergreyv = new wxBoxSizer(wxVERTICAL);
 	sizergreyv->Add(labelgreyv,wxSizerFlags().FixedMinSize());
-	sizergreyv->Add(_sliderrange,wxSizerFlags().FixedMinSize());
-	sizer->Add(sizergreyv,wxSizerFlags().FixedMinSize().Border());
+	sizergreyv->Add(_sliderrange,1, wxGROW);
+	sizer->Add(sizergreyv, 1, wxGROW);
 	
 	wxString choices0[2];
 	choices0[0] = _T("inside");
@@ -133,8 +158,10 @@ wxSizer* CutModelView::getOpacityActor(wxWindow* parent){
 	wxSlider* slider0 = new wxSlider(parent, -1, 60,0,100,wxDefaultPosition,wxDefaultSize,wxSL_LABELS);
 	Connect(slider0->GetId(), wxEVT_SCROLL_THUMBRELEASE,(wxObjectEventFunction)(&CutModelViewEventHandler::onOpacityChange));	
 	
-	sizeropacity->Add(labelopacity,wxSizerFlags().FixedMinSize());
-	sizeropacity->Add(slider0,wxSizerFlags().FixedMinSize());
+	//sizeropacity->Add(labelopacity,1, wxGROWwxSizerFlags().FixedMinSize());
+        sizeropacity->Add(labelopacity,1, wxGROW);
+	//sizeropacity->Add(slider0,wxSizerFlags().FixedMinSize());
+        sizeropacity->Add(slider0, 1, wxGROW);
 
 	return sizeropacity;
 }