X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_Icons_NDimensions%2FinterfToolsPanels.cxx;h=ea46142b8f9c0ccd0c8873c192a9a0bf0b42852c;hb=c9965cf71b0d0cf7c85e8877d0c3505c97b1c3e9;hp=5aa8b3fccf31e8d2276cf2f4b193f049a95d2e60;hpb=4d5574beaa0d2f56951b00a9fcca5dd945506e13;p=creaContours.git

diff --git a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
index 5aa8b3f..ea46142 100644
--- a/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
+++ b/lib/Interface_Icons_NDimensions/interfToolsPanels.cxx
@@ -20,20 +20,20 @@ interfConfigurationPanel::interfConfigurationPanel(wxWindow * parent)
 	int windowlevel = interfMainPanel::getInstance()->getWindowLevel();
 
 	
-	_brithtnessWindowLevel					= new wxSlider(this, -1, windowlevel , 1, range[1], wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
-	_brithtnessColorLevel					= new wxSlider(this, -1, colorwindow , 1, range[1], wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+	_brithtnessWindowLevel					= new wxSlider(this, -1, windowlevel , 1, (int)range[1], wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
+	_brithtnessColorLevel					= new wxSlider(this, -1, colorwindow , 1, (int)range[1], wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
 
 	_interpolationCheckBox = new wxCheckBox(this, -1, _T("Image interpolation") );
 	_interpolationCheckBox->SetValue(true);		
 
-	Connect( _withOfContourLine->GetId()		,	wxEVT_SCROLL_CHANGED	, (wxObjectEventFunction) &interfConfigurationPanel::onWidthOfContour	); 
-	Connect( _withOfContourLine->GetId()		,	wxEVT_SCROLL_THUMBTRACK , (wxObjectEventFunction) &interfConfigurationPanel::onWidthOfContour	); 
+	Connect( _withOfContourLine->GetId(),     wxEVT_SCROLL_CHANGED,           (wxObjectEventFunction) &interfConfigurationPanel::onWidthOfContour); 
+	Connect( _withOfContourLine->GetId(),     wxEVT_SCROLL_THUMBTRACK,        (wxObjectEventFunction) &interfConfigurationPanel::onWidthOfContour); 
 
-	Connect( _brithtnessWindowLevel->GetId()	,	wxEVT_SCROLL_CHANGED	, (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel	); 
-	Connect( _brithtnessWindowLevel->GetId()	,	wxEVT_SCROLL_THUMBTRACK , (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel	); 
-	Connect( _brithtnessColorLevel->GetId()		,	wxEVT_SCROLL_CHANGED	, (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel	); 
-	Connect( _brithtnessColorLevel->GetId()		,	wxEVT_SCROLL_THUMBTRACK , (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel	); 
-	Connect( _interpolationCheckBox->GetId()	,	wxEVT_COMMAND_CHECKBOX_CLICKED	  , (wxObjectEventFunction) &interfConfigurationPanel::OnInterpolation		);
+	Connect( _brithtnessWindowLevel->GetId(), wxEVT_SCROLL_CHANGED,           (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel); 
+	Connect( _brithtnessWindowLevel->GetId(), wxEVT_SCROLL_THUMBTRACK,        (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel); 
+	Connect( _brithtnessColorLevel->GetId()	, wxEVT_SCROLL_CHANGED,           (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel); 
+	Connect( _brithtnessColorLevel->GetId()	, wxEVT_SCROLL_THUMBTRACK,        (wxObjectEventFunction) &interfConfigurationPanel::onBrigthnessColorWindowLevel); 
+	Connect( _interpolationCheckBox->GetId(), wxEVT_COMMAND_CHECKBOX_CLICKED, (wxObjectEventFunction) &interfConfigurationPanel::OnInterpolation);
 
 	wxFlexGridSizer * sizer					= new wxFlexGridSizer(1);
 	sizer -> Add( new wxStaticText(this,-1,_T("Contour width"))  , 1, wxGROW );
@@ -237,8 +237,8 @@ interfInformationPanel::interfInformationPanel(wxWindow * parent)
    	_mbarrangeRangeInformation-> setRepresentedValues( range[0] , range[1] );
 	_mbarrangeRangeInformation-> setDeviceBlitStart(10,10); 
 	_mbarrangeRangeInformation-> setIfWithActualDrawed( false );
-	_mbarrangeRangeInformation-> SetStart( range[0] );
-	_mbarrangeRangeInformation-> SetEnd( range[1] );  
+	_mbarrangeRangeInformation-> SetStart( (int)range[0] );
+	_mbarrangeRangeInformation-> SetEnd( (int)range[1] );  
 
 
 	_staticTextInformation							= new wxStaticText(this,-1,_T("    "));
@@ -394,35 +394,3 @@ wxString interfInformationPanel::getCellValue(int j,int i){
 	return _grid->GetCellValue( j , i );
 }
 
-
-
-/**
-** Begin of the mirror panel
-**/
-
-interfMirrorPanel::interfMirrorPanel(wxWindow* parent)
-: wxPanel(parent, -1, wxDefaultPosition, wxDefaultSize, wxBORDER_SUNKEN)
-{
-	wxButton *mirrorGoBtn = new wxButton(this,-1,_T("Go"), wxDefaultPosition, wxSize(200,35) );
-	_thickness = new wxSlider(this, -1, 0 , 0, 10, wxDefaultPosition, wxSize(200,35), wxSL_HORIZONTAL|wxSL_LABELS, wxDefaultValidator);
-	
-	Connect( mirrorGoBtn->GetId(),		wxEVT_COMMAND_BUTTON_CLICKED , (wxObjectEventFunction) &interfMirrorPanel::onMirrorGo ); 
-
-	wxFlexGridSizer * sizer		= new wxFlexGridSizer(1);
-	sizer -> Add( new wxStaticText(this,-1,_T("Thickness"))  , 1, wxGROW );
-	sizer -> Add( _thickness, 1, wxGROW );
-	sizer -> Add( mirrorGoBtn, 1, wxGROW );
-
-	this->SetSizer( sizer );
-	this->SetAutoLayout( true );
-	this->Layout();
-}
-
-interfMirrorPanel::~interfMirrorPanel(){
-}
-
-void interfMirrorPanel::onMirrorGo(wxCommandEvent& event)
-{
-	//wxString thick=_thickness->GetValue();
-	interfMainPanel::getInstance()->onMirror();
-}