no 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..00f9ec2b539bfda3b6ad96d0da6b1a4cdccddcf7 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -32,6 +32,12 @@
 #include "ContourExtractData.h"
 #include "PerformingOperation.h"
 
+#include "manualLineControler.h"
+#include "manualContourModelLine.h"
+#include "manualViewLine.h"
+
+#include "ThresholdImageView.h"
+#include "ThresholdImageViewPanel.h"
 
 
 //#include "ContourThing.h"
@@ -132,7 +138,7 @@ class wxContourMainFrame : public wxPanel {
        // Creational and initialization methods
        //------------------------------------------------------------------------------------------------------------
 
-       void setVectImages( std::vector<vtkImageData*> images );
+       void setVectImages(std::vector<vtkImageData*> imgs);
 
        bool configurePanels( );
 
@@ -150,8 +156,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, int selection, int minZ, int maxZ);
 
        void SaveImageResult(std::string directory,std::string namefile, vtkImageData* mask,vtkImageData* value);
 
@@ -222,7 +227,6 @@ class wxContourMainFrame : public wxPanel {
        void updateInstantOutlines();
        void updateInstantImageData();
        void updateInstantAxes();
-       void updateActor();
 
        void onChangeDeep(int val);
 
@@ -237,7 +241,7 @@ class wxContourMainFrame : public wxPanel {
        void onLoad();
        void onSave();
        
-       void openContours( FILE *pFile, bool staticContour );
+       void openContours( FILE *pFile, int version, bool staticContour );
 
        void RefreshInterface();
 
@@ -260,12 +264,8 @@ class wxContourMainFrame : public wxPanel {
 
        //AD
        void onMirror();
-       void onThreshold(int minVal, int maxVal);
-       void onThresholdChange(int minVal, int maxVal);
-       void onThresholdInterpolation(bool interpolate);
-       void onThresholdChangeOpacity (int opacity);
-       void onThresholdRemove();
-
+       
+       
 //==================================================================================================== 
 
        void showAxis(bool show);
@@ -293,9 +293,10 @@ class wxContourMainFrame : public wxPanel {
 
        std::vector<std::string> getOutlinesName(int slide);
 
-       void onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ);
+       void onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ,int grayRangeMin, int grayRangeMax);
 
-       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, int selection, int minZ, int maxZ, bool XYZValues, bool contourImage, bool statistics);
 
        void SaveValuesXYZ(std::string directory,std::string namefile, int typeContourGroup);
 
@@ -306,6 +307,14 @@ class wxContourMainFrame : public wxPanel {
        void onSnakePressed();
 
        void saveFileWithContoursAutomatique();
+       
+       void ShowResultImages(int typeContourGroup, int selection, int minZ, int maxZ );
+
+       wxPanel *getMaskImageViewPanel(wxWindow *parent);
+       void SetContourGroup(int contourGroup);
+       wxPanel *getThresholdImageViewPanel(wxWindow *parent);
+
+       
 private:
        //------------------------------------------------------------------------------------------------------------
        //  Private methods
@@ -316,6 +325,8 @@ private:
        // Attributtes
        //------------------------------------------------------------------------------------------------------------
        
+       int _contourGroup;
+       
        static wxContourMainFrame* instance;
 
        KernelManagerContour* kernelManager;
@@ -344,35 +355,23 @@ private:
     long m_notebook_theme;
     int _numberOfVariablesStatistics;
        
-       vtkImageActor * _thresholdActor;
-
-       bool _actorPresent;
-
-       //OutlineModelManager * _modelManager;
 
+       // Contour Image Mask
+       ThresholdImageView              *_viewMaskImage;
+       ThresholdImageViewPanel *_viewMaskImagePanel;
        
+       // Threshold Image 
+       ThresholdImageView              *_viewThresholdImage;
+       ThresholdImageViewPanel *_viewThresholdImagePanel;
+       
+       
+       std::vector<vtkImageData*> _images;
 
-       //wxContour_ButtonsBar * _buttonsBar;
-
-       //wxContour_Grid *  _gridPanel;
-
-       //wxContour_DrawToolsPanel * _drawToolsPanel;
-
-       //wxContour_OperationsToolsPanel * _operationsToolsPanel;
-
-       //wxContour_AutomaticFormsToolsPanel * _autoFormsPanel; 
-
-       //wxContour_StandardToolsPanel *_standardToolsPanel;
-
-       //wxContour_EdtionToolsPanel * _editionToolsPanel;
-
-       //wxContour_ListViewPanel * _listViewPanel;
-
-       //wxVtkBaseView_SceneManager * _sceneManager;
-
-       //Instant * _actualInstant;
+       bool _actorPresent;
 
        
+       
+       
 
        /*DECLARE_CLASS(wxContourMainFrame)
        // any class wishing to process wxWindows events must use this macro
@@ -384,11 +383,13 @@ private:
        //manualContourModel * factoryManualContourModel(int typeContour);
 
        manualContourModel * factoryManualContourModel(wxPanel* panel);
+       
+       ContourExtractData      *_contourextractdata;
 
-
-
+       
        void saveState();
        void loadState(std::string filename);
+       void loadContours( FILE *pFile, bool staticContour );
 
        void saveFileWithContours( std::string filename );