X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=9a49da6b1599c50f3ab1360deabb5de70c797fd7;hb=fb263161d35e038b20630dbf6566df07777ec027;hp=ba7da1b5182f88f71d8e9e09cecc809437dee3cd;hpb=acfa5d75d60420addd2adb9c134efd52e7a4459f;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index ba7da1b..9a49da6 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h @@ -82,6 +82,9 @@ //EED10JUIN2011 #include "itkImageFileWriter.h" +//EED2020-03-18 +#undef Success + #include "itkImageToVTKImageFilter.h" #include "itkVTKImageToImageFilter.h" @@ -96,7 +99,6 @@ #include "vtkMetaImageWriter.h" #include "vtkImageData.h" #include "vtkTransform.h" - #include "vtkCamera.h" #include "vtkImageActor.h" #include @@ -120,58 +122,36 @@ //------------------------------------------------------------------------------------------------------------ class interfMainPanel; class wxContourMainFrame : public wxPanel { - public: - //------------------------------------------------------------------------------------------------------------ // 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/"); - ~wxContourMainFrame(); - //------------------------------------------------------------------------------------------------------------ // Creational and initialization methods //------------------------------------------------------------------------------------------------------------ - void setVectImages(std::vector imgs); - bool configurePanels( ); - bool addNewPanel(wxPanel* panel); - wxAuiNotebook * createNotebook(); - void createInstantChooserPanel(wxAuiNotebook * parent); - void createViewPanel(wxAuiNotebook * parent); - void createInstantChooserPanel(wxWindow * parent); - void createViewPanel(wxWindow * parent); - void setInstantChooserPanel( wxInstantChooserPanel * theInstantChooserPanel ); - 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); - void ShowToolsPanel(bool show); - - ////------------------------------------------------------------------------------------------------------------ //// Methods for capturing events ////------------------------------------------------------------------------------------------------------------ - ////------------------------------------------------------------------------------------------------------------ //// Model management methods ////------------------------------------------------------------------------------------------------------------ - //------------------------------------------------------------------------------------------------------------ // Attributes getters and setters //------------------------------------------------------------------------------------------------------------ @@ -209,19 +189,13 @@ class wxContourMainFrame : public wxPanel { void setConceptValue( std::string name, int value ); ConceptDataWrap* getLastConceptData(); bool getIfConceptCheckedAt( std::string name, int pos ); - void changeInstant(); - int getNamesWrappingSize(); - std::string getNameWrapping(int i); - void updateInstantOutlines(); void updateInstantImageData(); void updateInstantAxes(); - void onChangeDeep(int val); - /////////////////////////// void onCopy(); void onPaste(); @@ -235,11 +209,8 @@ class wxContourMainFrame : public wxPanel { void onImport(); void onTest(); void openContours( FILE *pFile, FILE *pFileData, bool staticContour ); - void RefreshInterface(); - vtkImageData* getImageData(); - void onSegmentationOneSlice(int isovalue,int sampling,int method); void onSegmentationOneSliceITK(wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation); void SegmentationOneSlice( int x, int y, int z, int isovalue, int sampling, int method ); @@ -265,7 +236,6 @@ class wxContourMainFrame : public wxPanel { void FlipAllContours(int flipDirection); void FlipLstOfContours(std::vector lstNameThings, int flipDirection); - //==================================================================================================== void showAxis(bool show); @@ -275,6 +245,9 @@ class wxContourMainFrame : public wxPanel { int getWindowLevel(); void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel); void onInterpolation(bool interpolate); + void onShowTextContour(bool show); + void onBeforeAfterContour(bool before, bool after); + void onJumpSlice(int step,int shift); void onChangeInstant(std::string name,int actual); void resetAppend(); void onSpreadAdd(); @@ -287,19 +260,19 @@ 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 ); + 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); + void SetContourGroup(int contourGroup); wxPanel *getThresholdImageViewPanel(wxWindow *parent); wxPanel *getColorLayerImageViewPanel(wxWindow *parent); - + void SetColorLayerImage(vtkImageData*); //CMRU 17-08-09----------------------------------------------------------------------------------------------- @@ -350,9 +323,13 @@ class wxContourMainFrame : public wxPanel { //------------------------------------------------------------------------------------------------------------ void SetScalarRange(int grayRangeMin, int grayRangeMax); + std::string GetStringTypeImage( vtkImageData* image); //------------------------------------------------------------------------------------------------------------ + void SetXY(int x,int y); + + private: //------------------------------------------------------------------------------------------------------------ // Private methods @@ -363,7 +340,7 @@ private: // Attributtes //------------------------------------------------------------------------------------------------------------ - int _contourGroup; + int _contourGroup; static wxContourMainFrame *instance; KernelManagerContour *kernelManager; interfMainPanel *_pannew; @@ -379,16 +356,16 @@ private: wxAuiManager m_mgr; wxAuiNotebook *notebook; - long m_notebook_style; - long m_notebook_theme; - int _numberOfVariablesStatistics; + long m_notebook_style; + long m_notebook_theme; + int _numberOfVariablesStatistics; // Contour Image Mask - ThresholdImageView *_viewMaskImage; + ThresholdImageView *_viewMaskImage; ThresholdImageViewPanel *_viewMaskImagePanel; // Threshold Image - ThresholdImageView *_viewThresholdImage; + ThresholdImageView *_viewThresholdImage; ThresholdImageViewPanel *_viewThresholdImagePanel; // Color Layer Image @@ -397,9 +374,9 @@ private: bool _actorPresent; // temporary variables readding .roi file - int _tmpReadFileImageDim[3]; - double _tmpReadFileImageSpac[3]; - int _tmpReadFileTypeOfTransformation; + int _tmpReadFileImageDim[3]; + double _tmpReadFileImageSpac[3]; + int _tmpReadFileTypeOfTransformation; void readDimSpc(FILE *pFile, bool interactiveOption); @@ -436,6 +413,8 @@ private: std::string _fileLocation; //------------------------------------------------------------------------------------------------------------ + wxFrame *_frameShowResultImages; + }; #endif