X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.cxx;h=26678b33bb2c7d805ce11f5734babcf524fae6ec;hb=498505024562b776b91e25ca30f6e9c6bbd1f963;hp=8c8beb05edb61a3fae3d56edcde0459c526bc5da;hpb=7d61ec98f760736e883639ad6f71b0c88e35a1a2;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
index 8c8beb0..26678b3 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.cxx
@@ -68,7 +68,8 @@ char wxContourMainFrame::COPY = 'C';
 		_viewMaskImagePanel			= NULL;
 		_viewThresholdImage			= NULL;
 		_viewThresholdImagePanel	= NULL;
-
+		_viewColorLayerImage		= NULL;
+		_viewColorLayerImagePanel	= NULL;
 	}
 
 	wxContourMainFrame :: wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style,std::string datadir)		
@@ -88,6 +89,8 @@ char wxContourMainFrame::COPY = 'C';
 		_viewMaskImagePanel			= NULL;
 		_viewThresholdImage			= NULL;
 		_viewThresholdImagePanel	= NULL;
+		_viewColorLayerImage		= NULL;
+		_viewColorLayerImagePanel	= NULL;
 
 		// set up default notebook style
 		m_notebook_style =wxAUI_NB_TAB_SPLIT | wxAUI_NB_TAB_EXTERNAL_MOVE | wxNO_BORDER;
@@ -670,7 +673,15 @@ void wxContourMainFrame::changeInstant()
 				_viewThresholdImage->onThreshold();
 			}
 		}
-	
+
+	// Refresh Threshold image
+		if(_viewColorLayerImage!=NULL){
+			_viewColorLayerImage->SetZ(actualSlice);			
+			if (_viewColorLayerImagePanel->IsVisible()==true){
+				_viewColorLayerImage->onThreshold();
+			}
+		}
+
 		updateInstantOutlines();
 		updateInstantImageData();
 		updateInstantAxes();
@@ -1008,6 +1019,17 @@ void wxContourMainFrame::onImport(){
 
 	}
 }
+void wxContourMainFrame::onTest(){
+	std::string filename, filenamecontours;
+	wxFileDialog dialog(NULL, _T("Choose a File"), _T(""), _T(""), _T("*.*"), wxOPEN );
+
+	if (dialog.ShowModal() == wxID_OK)
+	{
+		filename = dialog.GetPath().mb_str();		
+		std::cout << "This is the filename: " << filename << std::endl;
+	}
+}
+
 
 //AD: 29-05-09
 void wxContourMainFrame::onSave(){
@@ -2897,8 +2919,10 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef
 // Image Value
 	vtkMetaImageWriter *writerValueImage = vtkMetaImageWriter::New( );
 	writerValueImage->SetInput( value );
+	writerValueImage->SetInput( value );
 	writerValueImage->SetFileName( (const char *)filename.mb_str() );
 	writerValueImage->SetFileDimensionality( 3 );
+	writerValueImage->SetCompression(false);
 	writerValueImage->Write( );
 
 // Image Mask
@@ -2918,6 +2942,7 @@ void wxContourMainFrame::SaveImageResult(std::string directory,std::string namef
 	writerMaskImage->SetInput( mask );
 	writerMaskImage->SetFileName( (const char *)filename.mb_str() );
 	writerMaskImage->SetFileDimensionality( 3 );
+	writerValueImage->SetCompression(false);
 	writerMaskImage->Write( );
 
 	interfMainPanel::getInstance()->setStringInfoPanel( _T("") );
@@ -2988,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() );
@@ -3004,11 +3027,30 @@ wxPanel *wxContourMainFrame::getMaskImageViewPanel(wxWindow *parent)
 		_viewMaskImage->SetBaseColor( 0,0,1 );
 		_viewMaskImagePanel->SetThresholdImageView( _viewMaskImage );
 		_viewMaskImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() );
-		
 	}
 	return _viewMaskImagePanel;
 }
 
+
+wxPanel *wxContourMainFrame::getColorLayerImageViewPanel(wxWindow *parent)
+{
+	if 	(_viewColorLayerImagePanel==NULL)
+	{
+		double range[2];
+		_theViewPanel->getImageData()->GetScalarRange(range);
+		int min = (int)floor (range[0]);
+		int max = (int)ceil (range[1]);		
+		_viewColorLayerImagePanel = new ColorLayerImageViewPanel( parent, min, max , 1);
+		_viewColorLayerImage = new ColorLayerImageView();
+//		_viewColorLayerImage->SetImage( _theViewPanel->getImageData() );
+		_viewColorLayerImage->SetImage( NULL );
+		_viewColorLayerImagePanel->SetColorLayerImageView( _viewColorLayerImage );
+		_viewColorLayerImage->SetwxVtkBaseView( _theViewPanel->getWxVtkBaseView() );
+	}
+	return _viewColorLayerImagePanel;
+}
+
+
 wxPanel *wxContourMainFrame::getThresholdImageViewPanel(wxWindow *parent)
 {
 	if 	(_viewThresholdImagePanel==NULL)