X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=2105598c39d89e41b5303e3f14d8959e4eee7342;hb=5c93569581d7cf3032e983d4304dddcd400ce009;hp=d73d2e75290b05727067598dd2540ab4f8b64b85;hpb=eadfc36256b2a77d2c3073d9249ce3020c2f554b;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index d73d2e7..2105598 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h @@ -38,34 +38,8 @@ #include "ThresholdImageView.h" #include "ThresholdImageViewPanel.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 @@ -81,7 +55,7 @@ #include "itkZeroCrossingImageFilter.h" #include "itkCastImageFilter.h" -#include "itkImageFileWriter.h" +//EED10JUIN2011 #include "itkImageFileWriter.h" #include "itkImageToVTKImageFilter.h" #include "itkVTKImageToImageFilter.h" @@ -127,7 +101,7 @@ class wxContourMainFrame : public wxPanel { //------------------------------------------------------------------------------------------------------------ // Constructors & Destructors //------------------------------------------------------------------------------------------------------------ - + wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,long style = wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER); wxContourMainFrame(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector images, long style = wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,std::string datadir="C:/Creatis/creaContoursBin/RelWithDebInfo/"); @@ -149,7 +123,7 @@ class wxContourMainFrame : public wxPanel { void createInstantChooserPanel(wxAuiNotebook * parent); void createViewPanel(wxAuiNotebook * parent); - + void createInstantChooserPanel(wxWindow * parent); void createViewPanel(wxWindow * parent); @@ -163,26 +137,16 @@ 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 ////------------------------------------------------------------------------------------------------------------ - + ////------------------------------------------------------------------------------------------------------------ //// Model management methods ////------------------------------------------------------------------------------------------------------------ - + //------------------------------------------------------------------------------------------------------------ // Attributes getters and setters //------------------------------------------------------------------------------------------------------------ @@ -195,7 +159,7 @@ class wxContourMainFrame : public wxPanel { //------------------------------------------------------------------------------------------------------------ /* - ** This method returns the vector of images selected by the user + ** This method returns the vector of images selected by the user ** return value std::vector */ std::vector getVectImages(); @@ -243,8 +207,9 @@ class wxContourMainFrame : public wxPanel { ///////////////////////7 void onLoad(); void onSave(); - - void openContours( FILE *pFile, FILE *pFileData, int version, bool staticContour ); + void onImport(); + void onTest(); + void openContours( FILE *pFile, FILE *pFileData, bool staticContour ); void RefreshInterface(); @@ -267,33 +232,23 @@ class wxContourMainFrame : public wxPanel { //AD void onMirror(); - - -//==================================================================================================== - void showAxis(bool show); - void onRigidPressed(); +//==================================================================================================== + 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 onSpreadAddAll(); void onSpreadGo(int type); - void getInstantVector(std::vector& tempVector); - std::vector getOutlinesName(int slide); // @@ -301,44 +256,36 @@ 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, + 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); + wxPanel *getColorLayerImageViewPanel(wxWindow *parent); //CMRU 17-08-09----------------------------------------------------------------------------------------------- /** * Associates the String parameter with the contour - * @param label Label entered by the user - * @param manualBaseModel Currently selected contour + * @param label Label entered by the user + * @param manualBaseModel Currently selected contour */ void onPrintLabel (wxString label, manualBaseModel* manualModel); /** - * Calculates the size of the contour received as a parameter. Uses the measure of a pixel in millimeters. - * @param manualBaseModel Currently selected contour + * Calculates the size of the contour received as a parameter. Uses the measure of a pixel in millimeters. + * @param manualBaseModel Currently selected contour */ void onInsertCalculation(manualBaseModel* manualModel); /** - * Assigns and returns the value of a pixel in millimeters + * Assigns and returns the value of a pixel in millimeters @ param value Measure of the pixel in millimeters */ double onePixelSize(double value); @@ -347,25 +294,25 @@ class wxContourMainFrame : public wxPanel { * Returns the type of the currently selected contour */ int getType(); - + /** - * Returns the size in pixels of the currently selected contour + * Returns the size in pixels of the currently selected contour */ double getContourSizeInPixels(); - + /** - * Returns the currently selected contour. If no contour is selected returns NULL - */ + * Returns the currently selected contour. If no contour is selected returns NULL + */ manualBaseModel* getContour(); - + /** * Returns the Path of the data persistence file */ std::string GetFileLocation(); - + /** * Assign a new path to the data persistence file - @ param newFileLocation New path of the file + @ param newFileLocation New path of the file */ void SetFileLocation(std::string newFileLocation); //------------------------------------------------------------------------------------------------------------ @@ -373,101 +320,90 @@ class wxContourMainFrame : public wxPanel { void SetScalarRange(int grayRangeMin, int grayRangeMax); //------------------------------------------------------------------------------------------------------------ - + private: //------------------------------------------------------------------------------------------------------------ // Private methods //------------------------------------------------------------------------------------------------------------ - + //------------------------------------------------------------------------------------------------------------ // Attributtes //------------------------------------------------------------------------------------------------------------ - - int _contourGroup; - - static wxContourMainFrame* instance; - - KernelManagerContour* kernelManager; - interfMainPanel* _pannew; - - PerformingOperation* _performingOperation; - - std::string _datadir; - - wxContourViewPanel* _theViewPanel; - - wxInstantChooserPanel * _instantPanel; + 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 - manualLineControler * _refLineControl; - manualContourModelLine * _refLineModel; - manualViewLine * _refLineView; + manualLineControler *_refLineControl; + 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; - wxAuiManager m_mgr; - wxAuiNotebook * notebook; + // Threshold Image + ThresholdImageView *_viewThresholdImage; + ThresholdImageViewPanel *_viewThresholdImagePanel; - long m_notebook_style; - long m_notebook_theme; - int _numberOfVariablesStatistics; - + // Color Layer Image + ColorLayerImageView *_viewColorLayerImage; + ColorLayerImageViewPanel *_viewColorLayerImagePanel; + std::vector _images; + bool _actorPresent; + + // temporary variables readding .roi file + int _tmpReadFileImageDim[3]; + double _tmpReadFileImageSpac[3]; + int _tmpReadFileTypeOfTransformation; + void readDimSpc(FILE *pFile, bool interactiveOption); - // Contour Image Mask - ThresholdImageView *_viewMaskImage; - ThresholdImageViewPanel *_viewMaskImagePanel; - - // Threshold Image - ThresholdImageView *_viewThresholdImage; - ThresholdImageViewPanel *_viewThresholdImagePanel; - - - std::vector _images; - - bool _actorPresent; - - - - /*DECLARE_CLASS(wxContourMainFrame) // any class wishing to process wxWindows events must use this macro DECLARE_EVENT_TABLE()*/ - bool _creatingContoursActive; + bool _creatingContoursActive; ////////JCP 21 - 11 - 08 void createContour( int typeContour ); - //manualContourModel * factoryManualContourModel(int typeContour); - manualBaseModel * factoryManualContourModel(wxPanel* panel); - - ContourExtractData *_contourextractdata; + ContourExtractData *_contourextractdata; - void saveState(); void loadState(std::string filename); - void loadContours( FILE *pFile, bool staticContour ); - void saveFileWithContours( std::string filename ); - - int inredo; - int inundo; - std::string stundoredo; +// void loadContours( FILE *pFile, bool staticContour ); + void saveFileWithContours( std::string filename ); + void onLoadContours(std::string fileNameContourROI, bool interactiveInterface); - static char COPY; + int inredo; + int inundo; + std::string stundoredo; + static char COPY; //CMRU 17-08-09----------------------------------------------------------------------------------------------- - wxWindow *infoWin2; - wxPanel *calibrationPanel; - wxPanel *calibrationPanelError; - double _onePixelSize; - std::string _imageLocation; - std::string _fileLocation; + wxWindow *infoWin2; + wxPanel *calibrationPanel; + wxPanel *calibrationPanelError; + double _onePixelSize; + std::string _imageLocation; + std::string _fileLocation; //------------------------------------------------------------------------------------------------------------ }; -#endif +#endif