From: Eduardo Davila <Eduardo.Davila@creatis.insa-lyon.fr>
Date: Wed, 21 Jul 2010 15:57:22 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: CREATOOLS.2-0-3~8
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=8273a848852ed2b83e0e1542fa379af58306cb64;p=creaContours.git

*** empty log message ***
---

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() );
 	}