]> Creatis software - creaContours.git/commitdiff
avoid warnings
authorjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Thu, 16 Apr 2009 16:20:51 +0000 (16:20 +0000)
committerjean-pierre roux <jean-pierre.roux@creatis.insa-lyon.fr>
Thu, 16 Apr 2009 16:20:51 +0000 (16:20 +0000)
lib/Interface_Icons_NDimensions/interfSegmentationPanels.cxx
lib/Interface_Icons_NDimensions/interfToolsPanels.cxx

index edb257c80ca7721ea6f89964ee2d298c387d9482..4345971c95586d0bafa9d6830dbfc982162ce964 100644 (file)
@@ -22,7 +22,7 @@ interfSegmentationPanelVTK::interfSegmentationPanelVTK(wxWindow * parent)
        methodRadiobox->SetSelection(2);
        _staticTextSegmentation             = new wxStaticText(this,-1,_T("    "));
 
-       _mbarrange                          =  new mBarRange(this,70, 65);
+       _mbarrange                          = new mBarRange(this,70, 65);
        _mbarrange->SetMin(0);
        _mbarrange->SetStart(0);
 
@@ -265,8 +265,8 @@ interfThresholdPanel::interfThresholdPanel(wxWindow* parent)
        double range[2];
        interfMainPanel::getInstance()->getImageRange(range);
        
-       int min = floor (range[0]);
-       int max = ceil (range[1]);
+       int min = (int)floor (range[0]);
+       int max = (int)ceil (range[1]);
 
        _mBarThreshold  =  new mBarRange(this,70,65);
        _mBarThreshold->SetMin(0);
index a58702806cbe4d14fa28abdb651fdb8aec847b6b..ea46142b8f9c0ccd0c8873c192a9a0bf0b42852c 100644 (file)
@@ -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("    "));