X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=a6c610564d3ee1e84120dee6e19bdf58ae17fc2a;hb=7bb4a2e269e8fc5d9344ddf5acdd6ef6a63409f5;hp=8bf345a000e893907e526c8fe27dde5919612e2c;hpb=507a00d9d7800568d6e8ae91905f2b07cd2b30ae;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index 8bf345a..a6c6105 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,38 @@ //------------------------------------------------------------------------------------------------------------ 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); - + void changeImage(int id, vtkImageData *img); + void configure(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); - + wxVtkBaseView* GetWxVtkBaseView(); 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 +191,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(); @@ -230,24 +206,22 @@ class wxContourMainFrame : public wxPanel { void createCopyContourOf ( std::string anExistingKName, std::vector &instantNoTouchData, bool append ); void createMirrorContourOf ( std::string anExistingKName, std::vector &instantNoTouchData, bool append ); ///////////////////////7 - void onLoad(); + void onLoad(bool interactiveInterface=true); void onSave(); 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 onSegmentationOneSlice(double 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 ); + void SegmentationOneSlice( int x, int y, int z, double isovalue, int sampling, int method , vtkImageData *imagedata); void SegmentationOneSliceITK(int x, int y, int z, wxString distance, wxString sigma, wxString alfa, wxString beta, wxString propagation, wxString iterations, wxString inflation); void Mirror( int x, int y, int z, int isovalue, int sampling, int method ); int GetImageDataSizeZ(); void GetImageDataRange(double *range); - void onSegmentationAllSlice(int minZ,int maxZ,int isovalue,int sampling,int method); + void onSegmentationAllSlices(int minZ,int maxZ,double isovalue,int sampling,int method); + void onSegmentationAllSlices2(int step ,double isovalue,int samplsing,int method,int minZ, int maxZ,vtkImageData* imagedata); //AD void referenceLine(); @@ -258,6 +232,12 @@ class wxContourMainFrame : public wxPanel { //AD void onMirror(); + //EED + void FlipContours(int typeContourFlip, int flipDirection); + void FlipSelectedContours(int flipDirection); + void FlipActualSliceContours(int flipDirection); + void FlipAllContours(int flipDirection); + void FlipLstOfContours(std::vector lstNameThings, int flipDirection); //==================================================================================================== @@ -268,6 +248,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(); @@ -280,19 +263,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----------------------------------------------------------------------------------------------- @@ -343,8 +326,10 @@ class wxContourMainFrame : public wxPanel { //------------------------------------------------------------------------------------------------------------ void SetScalarRange(int grayRangeMin, int grayRangeMax); + std::string GetStringTypeImage( vtkImageData* image); //------------------------------------------------------------------------------------------------------------ + void SetXY(int x,int y); private: //------------------------------------------------------------------------------------------------------------ @@ -356,7 +341,7 @@ private: // Attributtes //------------------------------------------------------------------------------------------------------------ - int _contourGroup; + int _contourGroup; static wxContourMainFrame *instance; KernelManagerContour *kernelManager; interfMainPanel *_pannew; @@ -372,9 +357,9 @@ 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; @@ -385,15 +370,14 @@ private: ThresholdImageViewPanel *_viewThresholdImagePanel; // 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; + int _tmpReadFileImageDim[3]; + double _tmpReadFileImageSpac[3]; + int _tmpReadFileTypeOfTransformation; void readDimSpc(FILE *pFile, bool interactiveOption); @@ -407,13 +391,14 @@ private: manualBaseModel * factoryManualContourModel(wxPanel* panel); ContourExtractData *_contourextractdata; - void saveState(); - void loadState(std::string filename); + void saveState(); + void loadState(std::string filename); // void loadContours( FILE *pFile, bool staticContour ); void saveFileWithContours( std::string filename ); void onLoadContours(std::string fileNameContourROI, bool interactiveInterface); + void SetZForAllContours(int pz); int inredo; int inundo; @@ -429,6 +414,8 @@ private: std::string _fileLocation; //------------------------------------------------------------------------------------------------------------ + wxFrame *_frameShowResultImages; + }; #endif