*** empty log message ***

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxContourMainFrame.h

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index b86de8da0dbb17cc77b83a3994a9d6368110f307..46b6a2ab7bc0ba6314cf110c1ddc81af0f16b274 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -32,7 +32,9 @@
 #include "ContourExtractData.h"
 #include "PerformingOperation.h"
 
-
+#include "manualLineControler.h"
+#include "manualContourModelLine.h"
+#include "manualViewLine.h"
 
 //#include "ContourThing.h"
 //#include "AxeThing.h"
@@ -132,7 +134,7 @@ class wxContourMainFrame : public wxPanel {
        // Creational and initialization methods
        //------------------------------------------------------------------------------------------------------------
 
-       void setVectImages( std::vector<vtkImageData*> images );
+       void setVectImages(std::vector<vtkImageData*> imgs);
 
        bool configurePanels( );
 
@@ -151,7 +153,7 @@ class wxContourMainFrame : public wxPanel {
        void setInstantChooserPanel(  wxInstantChooserPanel * theInstantChooserPanel );
 
 
-       void getMaskValue(vtkImageData* mask,vtkImageData* value,int typeContourGroup);
+       void getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup);
 
        void SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value);
 
@@ -236,7 +238,7 @@ class wxContourMainFrame : public wxPanel {
        void onLoad();
        void onSave();
        
-       void openContours( FILE *pFile, bool staticContour );
+       void openContours( FILE *pFile, int version );
 
        void RefreshInterface();
 
@@ -294,7 +296,8 @@ class wxContourMainFrame : public wxPanel {
 
        void onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ);
 
-       void onSaveResults(std::string directory,std::string namefile, std::string filename, int typeContourGroup);
+       void onSaveResults(std::string directory,std::string namefile, std::string filename, 
+               int typeContourGroup, bool XYZValues, bool contourImage, bool statistics);
 
        void SaveValuesXYZ(std::string directory,std::string namefile, int typeContourGroup);
 
@@ -348,6 +351,7 @@ private:
        vtkImageMapToColors * _thresholdMapper;
        vtkImageActor * _thresholdActor;
 
+       std::vector<vtkImageData*> _images;
 
        bool _actorPresent;
 
@@ -392,6 +396,7 @@ private:
 
        void saveState();
        void loadState(std::string filename);
+       void loadContours( FILE *pFile );
 
        void saveFileWithContours( std::string filename );