X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=c109ece302ccdc7dce31f191bb5eca6f0c5897b4;hb=64a6730d769e99153ff422062673e6b39f6a277d;hp=32adc0fdc3ea420d6386875133142b03763011fa;hpb=6383d69864c69a97539b59d3e39406c79408577b;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index 32adc0f..c109ece 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h @@ -101,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/"); @@ -123,7 +123,7 @@ class wxContourMainFrame : public wxPanel { void createInstantChooserPanel(wxAuiNotebook * parent); void createViewPanel(wxAuiNotebook * parent); - + void createInstantChooserPanel(wxWindow * parent); void createViewPanel(wxWindow * parent); @@ -140,13 +140,13 @@ class wxContourMainFrame : public wxPanel { ////------------------------------------------------------------------------------------------------------------ //// Methods for capturing events ////------------------------------------------------------------------------------------------------------------ - + ////------------------------------------------------------------------------------------------------------------ //// Model management methods ////------------------------------------------------------------------------------------------------------------ - + //------------------------------------------------------------------------------------------------------------ // Attributes getters and setters //------------------------------------------------------------------------------------------------------------ @@ -159,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(); @@ -209,7 +209,7 @@ class wxContourMainFrame : public wxPanel { void onSave(); void onImport(); void onTest(); - void openContours( FILE *pFile, FILE *pFileData, int version, bool staticContour ); + void openContours( FILE *pFile, FILE *pFileData, bool staticContour ); void RefreshInterface(); @@ -232,9 +232,9 @@ class wxContourMainFrame : public wxPanel { //AD void onMirror(); - - -//==================================================================================================== + + +//==================================================================================================== void showAxis(bool show); void onRigidPressed(); @@ -246,6 +246,7 @@ class wxContourMainFrame : public wxPanel { 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); @@ -255,7 +256,7 @@ 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); @@ -272,19 +273,19 @@ class wxContourMainFrame : public wxPanel { /** * 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); @@ -293,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); //------------------------------------------------------------------------------------------------------------ @@ -319,81 +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; + 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; - - wxAuiManager m_mgr; - wxAuiNotebook * notebook; - long m_notebook_style; - long m_notebook_theme; - int _numberOfVariablesStatistics; - + 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; - - // Threshold Image + + // Threshold Image ThresholdImageView *_viewThresholdImage; ThresholdImageViewPanel *_viewThresholdImagePanel; - + // Color Layer Image ColorLayerImageView *_viewColorLayerImage; ColorLayerImageViewPanel *_viewColorLayerImagePanel; - std::vector _images; - bool _actorPresent; + std::vector _images; + bool _actorPresent; + + // temporary variables readding .roi file + int _tmpReadFileImageDim[3]; + double _tmpReadFileImageSpac[3]; + int _tmpReadFileTypeOfTransformation; + void readDimSpc(FILE *pFile, bool interactiveOption); + /*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 loadContours( FILE *pFile, bool staticContour ); + void saveFileWithContours( std::string filename ); - void onLoadContours(std::string fileNameContourROI); + void onLoadContours(std::string fileNameContourROI, bool interactiveInterface); - int inredo; - int inundo; - std::string stundoredo; - 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