*** 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 4b6ac62729b2880ad58c47c5bef8665d0710ed8a..32adc0fdc3ea420d6386875133142b03763011fa 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -38,36 +38,8 @@
 
 #include "ThresholdImageView.h"
 #include "ThresholdImageViewPanel.h"
-//EED #include "ColorLayerImageView.h"
-//EED #include "ColorLayerImageViewPanel.h"
-
-
-//#include "ContourThing.h"
-//#include "AxeThing.h"
-//#include "ImageSourceThing.h"
-//#include "ImageSectionThing.h"
-//#include "InstantMembersNameList.h"
-//#include "OutlineGroup.h"
-//#include "SomeEnvironment.h"
-//#include "ContourWorkspace.h"
-//#include "ContourWrap_ViewControl.h"
-//#include "Instant.h"
-//#include "PerformingOperation.h"
-
-//#include "ContourThing.h"
-
-//#include "OutlineModelManager.h"
-
-//#include "wxContour_ButtonsBar.h"
-//#include "wxContour_ControlPanel.h"
-
-//#include "wxContour_Grid.h"
-//#include "wxContour_DrawToolsPanel.h"
-//#include "wxContour_OperationsToolsPanel.h"
-//#include "wxContour_AutomaticFormsToolsPanel.h"
-//#include "wxContour_StandardToolsPanel.h"
-//#include "wxContour_EdtionToolsPanel.h"
-//#include "wxContour_ListViewPanel.h"
+#include "ColorLayerImageView.h"
+#include "ColorLayerImageViewPanel.h"
 
 
 //ITK
@@ -165,16 +137,6 @@ class wxContourMainFrame : public wxPanel {
        void ShowToolsPanel(bool show);
 
 
-//     void setButtonsBar(  wxContour_ButtonsBar * theButtonsBar );
-//     void setGrid(  wxContour_Grid * theGridPanel );
-//     void setDrawToolsPanel(  wxContour_DrawToolsPanel * theDrawToolsPanel );
-//     void setOperationsToolsPanel(  wxContour_OperationsToolsPanel * theDrawToolsPanel );
-//     void setAutomaticFormsPanel(  wxContour_AutomaticFormsToolsPanel * theAutoFormsPanel );
-//     void setStandardToolsPanel(  wxContour_StandardToolsPanel * theStandardToolsPanel );
-//     void setEditionToolsPanel(  wxContour_EdtionToolsPanel * theEditionToolsPanel );
-//     void setListViewPanel(  wxContour_ListViewPanel * theListViewPanel );
-
-
        ////------------------------------------------------------------------------------------------------------------
        //// Methods for capturing events
        ////------------------------------------------------------------------------------------------------------------
@@ -275,28 +237,17 @@ class wxContourMainFrame : public wxPanel {
 //==================================================================================================== 
 
        void showAxis(bool show);
-
        void onRigidPressed();
-
        void onWidthOfContour(double width);
-
        int getColorWindow();
        int getWindowLevel();
-
        void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel);
-
        void onInterpolation(bool interpolate);
-
        void onChangeInstant(std::string name,int actual);
-
        void resetAppend();
-
        void onSpreadAdd();
-
        void onSpreadGo(int type);
-
        void getInstantVector(std::vector<int>& tempVector);
-
        std::vector<std::string> getOutlinesName(int slide);
 
        //
@@ -304,22 +255,13 @@ class wxContourMainFrame : public wxPanel {
        // @param typeContourGroup - int The operation id (AND,OR,XOR,ALL=3)
        //
        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, int selection, int minZ, int maxZ, bool XYZValues, bool contourImage, bool statistics);
-
        void SaveValuesXYZ(std::string directory,std::string namefile, int typeContourGroup);
-
-       
-
        void onChangeInstantInstantPanel(std::string name,int value, int minshow, int maxshow);
-
        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);
@@ -389,19 +331,12 @@ private:
        //------------------------------------------------------------------------------------------------------------
        
        int _contourGroup;
-       
        static wxContourMainFrame* instance;
-
        KernelManagerContour* kernelManager;
-
        interfMainPanel* _pannew;
-
        PerformingOperation* _performingOperation;
-
        std::string _datadir;
-
        wxContourViewPanel* _theViewPanel;
-
        wxInstantChooserPanel * _instantPanel;
 
        //AD: 03-09: This attributes represents the reference line that is going to be used for the mirroring
@@ -409,16 +344,12 @@ private:
        manualContourModelLine  * _refLineModel;
        manualViewLine          * _refLineView;
 
-
-
        wxAuiManager m_mgr;
        wxAuiNotebook * notebook;
-
     long m_notebook_style;
     long m_notebook_theme;
     int _numberOfVariablesStatistics;
        
-
        // Contour Image Mask
        ThresholdImageView                      *_viewMaskImage;
        ThresholdImageViewPanel         *_viewMaskImagePanel;
@@ -428,44 +359,30 @@ private:
        ThresholdImageViewPanel         *_viewThresholdImagePanel;
        
        // Color Layer Image
-//EED  ColorLayerImageView                     *_viewColorLayerImage;
-//EED  ColorLayerImageViewPanel        *_viewColorLayerImagePanel;
-       wxPanel                                         *_viewColorLayerImagePanel;
-
+       ColorLayerImageView                     *_viewColorLayerImage;
+       ColorLayerImageViewPanel        *_viewColorLayerImagePanel;
        std::vector<vtkImageData*> _images;
-
        bool _actorPresent;
 
-       
-       
-       
-
        /*DECLARE_CLASS(wxContourMainFrame)
        // any class wishing to process wxWindows events must use this macro
        DECLARE_EVENT_TABLE()*/
        bool _creatingContoursActive;
 ////////JCP 21 - 11 - 08
        void createContour( int typeContour );
-
        //manualContourModel * factoryManualContourModel(int typeContour);
-
        manualBaseModel * factoryManualContourModel(wxPanel* panel);
-       
        ContourExtractData      *_contourextractdata;
 
-       
        void saveState();
        void loadState(std::string filename);
        void loadContours( FILE *pFile, bool staticContour );
-
        void saveFileWithContours( std::string filename );
        void onLoadContours(std::string fileNameContourROI);
 
        int inredo;
        int inundo;
        std::string     stundoredo;
-
-
        static char COPY;
 
 //CMRU 17-08-09-----------------------------------------------------------------------------------------------