*** 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 5733100aae36feb7e057dbb8b69bb192986886bf..d70c1eb7407ae0d48f65a2350d33dff3e737ea95 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);
 
@@ -222,7 +224,6 @@ class wxContourMainFrame : public wxPanel {
        void updateInstantOutlines();
        void updateInstantImageData();
        void updateInstantAxes();
-       void updateActor();
 
        void onChangeDeep(int val);
 
@@ -260,8 +261,8 @@ class wxContourMainFrame : public wxPanel {
 
        //AD
        void onMirror();
-       void onThreshold(int minVal, int maxVal);
-       void onThresholdChange(int minVal, int maxVal);
+       void onThreshold();
+       void onThresholdChange();
        void onThresholdInterpolation(bool interpolate);
        void onThresholdChangeOpacity (int opacity);
        void onThresholdRemove();
@@ -295,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);
 
@@ -344,8 +346,13 @@ private:
     long m_notebook_theme;
     int _numberOfVariablesStatistics;
        
+       vtkImageReslice * _imageReslicer;
+       vtkLookupTable * _thresholdTable;
+       vtkImageMapToColors * _thresholdMapper;
        vtkImageActor * _thresholdActor;
 
+       std::vector<vtkImageData*> _images;
+
        bool _actorPresent;
 
        //OutlineModelManager * _modelManager;