From 8273a848852ed2b83e0e1542fa379af58306cb64 Mon Sep 17 00:00:00 2001 From: Eduardo Davila Date: Wed, 21 Jul 2010 15:57:22 +0000 Subject: [PATCH] *** empty log message *** --- .../wxContourMainFrame.cxx | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx index a1276c0..26678b3 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx @@ -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() ); } -- 2.46.2