X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=4b6ac62729b2880ad58c47c5bef8665d0710ed8a;hb=b13d5fc346334fa875520c47c219a7092e80d09d;hp=d73d2e75290b05727067598dd2540ab4f8b64b85;hpb=eadfc36256b2a77d2c3073d9249ce3020c2f554b;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index d73d2e7..4b6ac62 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -38,6 +38,8 @@
 
 #include "ThresholdImageView.h"
 #include "ThresholdImageViewPanel.h"
+//EED #include "ColorLayerImageView.h"
+//EED #include "ColorLayerImageViewPanel.h"
 
 
 //#include "ContourThing.h"
@@ -243,7 +245,8 @@ class wxContourMainFrame : public wxPanel {
 ///////////////////////7
 	void onLoad();
 	void onSave();
-	
+	void onImport();
+	void onTest();
 	void openContours( FILE *pFile, FILE *pFileData, int version, bool staticContour );
 
 	void RefreshInterface();
@@ -320,6 +323,7 @@ class wxContourMainFrame : public wxPanel {
 	wxPanel *getMaskImageViewPanel(wxWindow *parent);
 	void SetContourGroup(int contourGroup);
 	wxPanel *getThresholdImageViewPanel(wxWindow *parent);
+	wxPanel *getColorLayerImageViewPanel(wxWindow *parent);
 
 
 //CMRU 17-08-09-----------------------------------------------------------------------------------------------
@@ -416,14 +420,18 @@ private:
 	
 
 	// Contour Image Mask
-	ThresholdImageView		*_viewMaskImage;
-	ThresholdImageViewPanel *_viewMaskImagePanel;
+	ThresholdImageView			*_viewMaskImage;
+	ThresholdImageViewPanel		*_viewMaskImagePanel;
 	
 	// Threshold Image 
-	ThresholdImageView		*_viewThresholdImage;
-	ThresholdImageViewPanel *_viewThresholdImagePanel;
-	
+	ThresholdImageView			*_viewThresholdImage;
+	ThresholdImageViewPanel		*_viewThresholdImagePanel;
 	
+	// Color Layer Image
+//EED	ColorLayerImageView			*_viewColorLayerImage;
+//EED	ColorLayerImageViewPanel	*_viewColorLayerImagePanel;
+	wxPanel						*_viewColorLayerImagePanel;
+
 	std::vector<vtkImageData*> _images;
 
 	bool _actorPresent;
@@ -451,6 +459,7 @@ private:
 	void loadContours( FILE *pFile, bool staticContour );
 
 	void saveFileWithContours( std::string filename );
+	void onLoadContours(std::string fileNameContourROI);
 
 	int inredo;
 	int inundo;