X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=c3dcaf7d98dc28898b748f90978b6d2056181a7e;hb=a654abbc209ed3104e98553cb381ef1c2845937a;hp=50a923f57617e374d6abc233c90aa39ecef1d8bc;hpb=ce5f8eeebd170070f519a200177e74b00180164a;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index 50a923f..c3dcaf7 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h @@ -22,19 +22,16 @@ #include "wx/aui/aui.h" #include "interfMainPanel.h" +#include "KernelManagerContour.h" -#include "wxVtkBaseView_SceneManager.h" +//#include "wxVtkBaseView_SceneManager.h" #include "wxInstantChooserPanel.h" #include "wxContourViewPanel.h" -#include "KernelManagerContour.h" - -#include "ContourWorkspace.h" -#include "ContourExtractData.h" - - +//#include "ContourWorkspace.h" +#include "ContourExtractData.h" #include "PerformingOperation.h" @@ -45,26 +42,26 @@ //#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 "SomeEnvironment.h" +//#include "ContourWorkspace.h" +//#include "ContourWrap_ViewControl.h" +//#include "Instant.h" +//#include "PerformingOperation.h" -#include "ContourThing.h" +//#include "ContourThing.h" //#include "OutlineModelManager.h" -#include "wxContour_ButtonsBar.h" -#include "wxContour_ControlPanel.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 "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" @@ -75,7 +72,7 @@ #include "vtkImageReslice.h" #include "vtkMetaImageWriter.h" #include "vtkImageData.h" -#include "vtkMetaImageReader.h" +//#include "vtkMetaImageReader.h" //------------------------------------------------------------------------------------------------------------ // Events declaration @@ -124,21 +121,21 @@ class wxContourMainFrame : public wxPanel { void setInstantChooserPanel( wxInstantChooserPanel * theInstantChooserPanel ); - void setButtonsBar( wxContour_ButtonsBar * theButtonsBar ); +// void setButtonsBar( wxContour_ButtonsBar * theButtonsBar ); - void setGrid( wxContour_Grid * theGridPanel ); +// void setGrid( wxContour_Grid * theGridPanel ); - void setDrawToolsPanel( wxContour_DrawToolsPanel * theDrawToolsPanel ); +// void setDrawToolsPanel( wxContour_DrawToolsPanel * theDrawToolsPanel ); - void setOperationsToolsPanel( wxContour_OperationsToolsPanel * theDrawToolsPanel ); +// void setOperationsToolsPanel( wxContour_OperationsToolsPanel * theDrawToolsPanel ); - void setAutomaticFormsPanel( wxContour_AutomaticFormsToolsPanel * theAutoFormsPanel ); +// void setAutomaticFormsPanel( wxContour_AutomaticFormsToolsPanel * theAutoFormsPanel ); - void setStandardToolsPanel( wxContour_StandardToolsPanel * theStandardToolsPanel ); +// void setStandardToolsPanel( wxContour_StandardToolsPanel * theStandardToolsPanel ); - void setEditionToolsPanel( wxContour_EdtionToolsPanel * theEditionToolsPanel ); +// void setEditionToolsPanel( wxContour_EdtionToolsPanel * theEditionToolsPanel ); - void setListViewPanel( wxContour_ListViewPanel * theListViewPanel ); +// void setListViewPanel( wxContour_ListViewPanel * theListViewPanel ); ////------------------------------------------------------------------------------------------------------------ @@ -259,6 +256,8 @@ class wxContourMainFrame : public wxPanel { void onChangeInstantInstantPanel(std::string name,int value, int minshow, int maxshow); void onSnakePressed(); + + void saveFileWithContoursAutomatique(); private: //------------------------------------------------------------------------------------------------------------ // Private methods @@ -274,6 +273,8 @@ private: wxContourViewPanel* _theViewPanel; + wxInstantChooserPanel * _instantPanel; + wxAuiManager m_mgr; /* @@ -286,25 +287,25 @@ private: //OutlineModelManager * _modelManager; - wxInstantChooserPanel * _instantPanel; + - wxContour_ButtonsBar * _buttonsBar; + //wxContour_ButtonsBar * _buttonsBar; - wxContour_Grid * _gridPanel; + //wxContour_Grid * _gridPanel; - wxContour_DrawToolsPanel * _drawToolsPanel; + //wxContour_DrawToolsPanel * _drawToolsPanel; - wxContour_OperationsToolsPanel * _operationsToolsPanel; + //wxContour_OperationsToolsPanel * _operationsToolsPanel; - wxContour_AutomaticFormsToolsPanel * _autoFormsPanel; + //wxContour_AutomaticFormsToolsPanel * _autoFormsPanel; - wxContour_StandardToolsPanel *_standardToolsPanel; + //wxContour_StandardToolsPanel *_standardToolsPanel; - wxContour_EdtionToolsPanel * _editionToolsPanel; + //wxContour_EdtionToolsPanel * _editionToolsPanel; - wxContour_ListViewPanel * _listViewPanel; + //wxContour_ListViewPanel * _listViewPanel; - wxVtkBaseView_SceneManager * _sceneManager; + //wxVtkBaseView_SceneManager * _sceneManager; //Instant * _actualInstant;