Changes with manualBaseModel. It improves the functionality with the new

[creaContours.git] / lib / Interface_ManagerContour_NDimensions / wxContourMainFrame.h

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
index 00f9ec2b539bfda3b6ad96d0da6b1a4cdccddcf7..21004c63d2766ea2574c70b14570e4264da9cca0 100644 (file)
--- a/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourMainFrame.h
@@ -189,6 +189,7 @@ class wxContourMainFrame : public wxPanel {
        static wxContourMainFrame* getInstance(wxWindow* parent, wxWindowID id,const wxString& title,const wxPoint& pos,const wxSize& size,std::vector<vtkImageData*> images, long style  = wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER, std::string datadir="C:/Creatis/creaContoursBin/RelWithDebInfo/");
        static wxContourMainFrame* getInstance();
        static void resetInstance();
+
        //------------------------------------------------------------------------------------------------------------
        //  Other functional methods
        //------------------------------------------------------------------------------------------------------------
@@ -206,6 +207,7 @@ class wxContourMainFrame : public wxPanel {
        void onCreateContourRectangle( );
        void onCreateContourCircle( );
        void onCreateContourLine( );
+       void onCreateContourPoints( );
        void onCreateContourBullEye(wxPanel* pan);
        /////////////////////////////////
        void onDeleteContour();
@@ -241,7 +243,7 @@ class wxContourMainFrame : public wxPanel {
        void onLoad();
        void onSave();
        
-       void openContours( FILE *pFile, int version, bool staticContour );
+       void openContours( FILE *pFile, FILE *pFileData, int version, bool staticContour );
 
        void RefreshInterface();
 
@@ -293,6 +295,10 @@ class wxContourMainFrame : public wxPanel {
 
        std::vector<std::string> getOutlinesName(int slide);
 
+       //
+       //
+       // @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, 
@@ -314,6 +320,56 @@ class wxContourMainFrame : public wxPanel {
        void SetContourGroup(int contourGroup);
        wxPanel *getThresholdImageViewPanel(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);
+//------------------------------------------------------------------------------------------------------------
+
+//------------------------------------------------------------------------------------------------------------
        
 private:
        //------------------------------------------------------------------------------------------------------------
@@ -382,7 +438,7 @@ private:
 
        //manualContourModel * factoryManualContourModel(int typeContour);
 
-       manualContourModel * factoryManualContourModel(wxPanel* panel);
+       manualBaseModel * factoryManualContourModel(wxPanel* panel);
        
        ContourExtractData      *_contourextractdata;
 
@@ -400,6 +456,15 @@ private:
 
        static char COPY;
 
+//CMRU 17-08-09-----------------------------------------------------------------------------------------------
+       wxWindow *infoWin2;
+       wxPanel *calibrationPanel;
+       wxPanel *calibrationPanelError;
+       double _onePixelSize;
+       std::string _imageLocation;
+       std::string _fileLocation;
+//------------------------------------------------------------------------------------------------------------
+
 };
 
 #endif