X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourMainFrame.h;h=4b6ac62729b2880ad58c47c5bef8665d0710ed8a;hb=b13d5fc346334fa875520c47c219a7092e80d09d;hp=91eac838062a93c4df7b667418fc6ce43c76a1b5;hpb=ae4e82199b7c2de2c149f84be5a10edcce7596e0;p=creaContours.git diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h index 91eac83..4b6ac62 100644 --- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h +++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h @@ -36,6 +36,12 @@ #include "manualContourModelLine.h" #include "manualViewLine.h" +#include "ThresholdImageView.h" +#include "ThresholdImageViewPanel.h" +//EED #include "ColorLayerImageView.h" +//EED #include "ColorLayerImageViewPanel.h" + + //#include "ContourThing.h" //#include "AxeThing.h" //#include "ImageSourceThing.h" @@ -134,7 +140,7 @@ class wxContourMainFrame : public wxPanel { // Creational and initialization methods //------------------------------------------------------------------------------------------------------------ - void setVectImages( std::vector images ); + void setVectImages(std::vector imgs); bool configurePanels( ); @@ -152,8 +158,7 @@ class wxContourMainFrame : public wxPanel { void setInstantChooserPanel( wxInstantChooserPanel * theInstantChooserPanel ); - - void getMaskValue(vtkImageData ** mask,vtkImageData ** value,int typeContourGroup); + 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); @@ -186,6 +191,7 @@ class wxContourMainFrame : public wxPanel { static wxContourMainFrame* getInstance(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/"); static wxContourMainFrame* getInstance(); static void resetInstance(); + //------------------------------------------------------------------------------------------------------------ // Other functional methods //------------------------------------------------------------------------------------------------------------ @@ -203,6 +209,8 @@ class wxContourMainFrame : public wxPanel { void onCreateContourRectangle( ); void onCreateContourCircle( ); void onCreateContourLine( ); + void onCreateContourPoints( ); + void onCreateContourPolygon( ); void onCreateContourBullEye(wxPanel* pan); ///////////////////////////////// void onDeleteContour(); @@ -237,8 +245,9 @@ class wxContourMainFrame : public wxPanel { ///////////////////////7 void onLoad(); void onSave(); - - void openContours( FILE *pFile, bool staticContour ); + void onImport(); + void onTest(); + void openContours( FILE *pFile, FILE *pFileData, int version, bool staticContour ); void RefreshInterface(); @@ -261,12 +270,8 @@ class wxContourMainFrame : public wxPanel { //AD void onMirror(); - void onThreshold(); - void onThresholdChange(); - void onThresholdInterpolation(bool interpolate); - void onThresholdChangeOpacity (int opacity); - void onThresholdRemove(); - + + //==================================================================================================== void showAxis(bool show); @@ -294,10 +299,14 @@ class wxContourMainFrame : public wxPanel { std::vector getOutlinesName(int slide); - void onInformationContourLabels(int typeContourGroup,int selection,int minimumZ,int maximumZ); + // + // + // @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, bool XYZValues, bool contourImage, bool statistics); + int typeContourGroup, int selection, int minZ, int maxZ, bool XYZValues, bool contourImage, bool statistics); void SaveValuesXYZ(std::string directory,std::string namefile, int typeContourGroup); @@ -308,6 +317,67 @@ class wxContourMainFrame : public wxPanel { 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 + */ + 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 + */ + void onInsertCalculation(manualBaseModel* manualModel); + + /** + * Assigns and returns the value of a pixel in millimeters + @ param value Measure of the pixel in millimeters + */ + double onePixelSize(double value); + + /** + * Returns the type of the currently selected contour + */ + int getType(); + + /** + * Returns the size in pixels of the currently selected contour + */ + double getContourSizeInPixels(); + + /** + * 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 + */ + void SetFileLocation(std::string newFileLocation); +//------------------------------------------------------------------------------------------------------------ + + void SetScalarRange(int grayRangeMin, int grayRangeMax); + +//------------------------------------------------------------------------------------------------------------ + private: //------------------------------------------------------------------------------------------------------------ // Private methods @@ -318,6 +388,8 @@ private: // Attributtes //------------------------------------------------------------------------------------------------------------ + int _contourGroup; + static wxContourMainFrame* instance; KernelManagerContour* kernelManager; @@ -346,39 +418,27 @@ private: long m_notebook_theme; int _numberOfVariablesStatistics; - vtkImageReslice * _imageReslicer; - vtkLookupTable * _thresholdTable; - vtkImageMapToColors * _thresholdMapper; - vtkImageActor * _thresholdActor; - - - bool _actorPresent; - - //OutlineModelManager * _modelManager; + // Contour Image Mask + ThresholdImageView *_viewMaskImage; + ThresholdImageViewPanel *_viewMaskImagePanel; + // Threshold Image + ThresholdImageView *_viewThresholdImage; + ThresholdImageViewPanel *_viewThresholdImagePanel; + + // Color Layer Image +//EED ColorLayerImageView *_viewColorLayerImage; +//EED ColorLayerImageViewPanel *_viewColorLayerImagePanel; + wxPanel *_viewColorLayerImagePanel; - //wxContour_ButtonsBar * _buttonsBar; - - //wxContour_Grid * _gridPanel; - - //wxContour_DrawToolsPanel * _drawToolsPanel; - - //wxContour_OperationsToolsPanel * _operationsToolsPanel; - - //wxContour_AutomaticFormsToolsPanel * _autoFormsPanel; - - //wxContour_StandardToolsPanel *_standardToolsPanel; - - //wxContour_EdtionToolsPanel * _editionToolsPanel; - - //wxContour_ListViewPanel * _listViewPanel; - - //wxVtkBaseView_SceneManager * _sceneManager; + std::vector _images; - //Instant * _actualInstant; + bool _actorPresent; + + /*DECLARE_CLASS(wxContourMainFrame) // any class wishing to process wxWindows events must use this macro @@ -389,14 +449,17 @@ private: //manualContourModel * factoryManualContourModel(int typeContour); - manualContourModel * factoryManualContourModel(wxPanel* panel); - - + manualBaseModel * factoryManualContourModel(wxPanel* panel); + + ContourExtractData *_contourextractdata; + void saveState(); void loadState(std::string filename); + void loadContours( FILE *pFile, bool staticContour ); void saveFileWithContours( std::string filename ); + void onLoadContours(std::string fileNameContourROI); int inredo; int inundo; @@ -405,6 +468,15 @@ private: static char COPY; +//CMRU 17-08-09----------------------------------------------------------------------------------------------- + wxWindow *infoWin2; + wxPanel *calibrationPanel; + wxPanel *calibrationPanelError; + double _onePixelSize; + std::string _imageLocation; + std::string _fileLocation; +//------------------------------------------------------------------------------------------------------------ + }; #endif