]> Creatis software - creaContours.git/commitdiff
*** empty log message ***
authorEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Wed, 21 Jul 2010 15:57:22 +0000 (15:57 +0000)
committerEduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Wed, 21 Jul 2010 15:57:22 +0000 (15:57 +0000)
lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx

index a1276c02d64c391390055a37a38fd98ebd07023c..26678b33bb2c7d805ce11f5734babcf524fae6ec 100644 (file)
@@ -3013,15 +3013,13 @@ wxPanel *wxContourMainFrame::getMaskImageViewPanel(wxWindow *parent)
        if      (_viewMaskImagePanel==NULL)
        {
                _contourextractdata = new ContourExtractData(true);
-               _contourextractdata->SetImage( _theViewPanel->getImageData() );
-               
+               _contourextractdata->SetImage( _theViewPanel->getImageData() );         
 //             double range[2];
 //             _theViewPanel->getImageData()->GetScalarRange(range);
                //int min = (int)floor (range[0]);
                //int max = (int)ceil (range[1]);
                int min = 254;
                int max = 256;
-               
                _viewMaskImagePanel = new ThresholdImageViewPanel( parent, -1, -1 , 0);
                _viewMaskImage = new ThresholdImageView();
                _viewMaskImage->SetImage(_contourextractdata->GetVtkImageMaskResult() );
@@ -3029,7 +3027,6 @@ wxPanel *wxContourMainFrame::getMaskImageViewPanel(wxWindow *parent)
                _viewMaskImage->SetBaseColor( 0,0,1 );
                _viewMaskImagePanel->SetThresholdImageView( _viewMaskImage );
                _viewMaskImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() );
-               
        }
        return _viewMaskImagePanel;
 }
@@ -3045,7 +3042,8 @@ wxPanel *wxContourMainFrame::getColorLayerImageViewPanel(wxWindow *parent)
                int max = (int)ceil (range[1]);         
                _viewColorLayerImagePanel = new ColorLayerImageViewPanel( parent, min, max , 1);
                _viewColorLayerImage = new ColorLayerImageView();
-               _viewColorLayerImage->SetImage( _theViewPanel->getImageData() );
+//             _viewColorLayerImage->SetImage( _theViewPanel->getImageData() );
+               _viewColorLayerImage->SetImage( NULL );
                _viewColorLayerImagePanel->SetColorLayerImageView( _viewColorLayerImage );
                _viewColorLayerImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() );
        }