#include "manualContourModelLine.h"
#include "manualViewLine.h"
-//#include "ContourThing.h"
-//#include "AxeThing.h"
-//#include "ImageSourceThing.h"
-//#include "ImageSectionThing.h"
-//#include "InstantMembersNameList.h"
-//#include "OutlineGroup.h"
-//#include "SomeEnvironment.h"
-//#include "ContourWorkspace.h"
-//#include "ContourWrap_ViewControl.h"
-//#include "Instant.h"
-//#include "PerformingOperation.h"
-
-//#include "ContourThing.h"
-
-//#include "OutlineModelManager.h"
-
-//#include "wxContour_ButtonsBar.h"
-//#include "wxContour_ControlPanel.h"
-
-//#include "wxContour_Grid.h"
-//#include "wxContour_DrawToolsPanel.h"
-//#include "wxContour_OperationsToolsPanel.h"
-//#include "wxContour_AutomaticFormsToolsPanel.h"
-//#include "wxContour_StandardToolsPanel.h"
-//#include "wxContour_EdtionToolsPanel.h"
-//#include "wxContour_ListViewPanel.h"
+#include "ThresholdImageView.h"
+#include "ThresholdImageViewPanel.h"
+#include "ColorLayerImageView.h"
+#include "ColorLayerImageViewPanel.h"
//ITK
//------------------------------------------------------------------------------------------------------------
// 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<vtkImageData*> images, long style = wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER,std::string datadir="C:/Creatis/creaContoursBin/RelWithDebInfo/");
void createInstantChooserPanel(wxAuiNotebook * parent);
void createViewPanel(wxAuiNotebook * parent);
-
+
void createInstantChooserPanel(wxWindow * parent);
void createViewPanel(wxWindow * parent);
void ShowToolsPanel(bool show);
-// void setButtonsBar( wxContour_ButtonsBar * theButtonsBar );
-// void setGrid( wxContour_Grid * theGridPanel );
-// void setDrawToolsPanel( wxContour_DrawToolsPanel * theDrawToolsPanel );
-// void setOperationsToolsPanel( wxContour_OperationsToolsPanel * theDrawToolsPanel );
-// void setAutomaticFormsPanel( wxContour_AutomaticFormsToolsPanel * theAutoFormsPanel );
-// void setStandardToolsPanel( wxContour_StandardToolsPanel * theStandardToolsPanel );
-// void setEditionToolsPanel( wxContour_EdtionToolsPanel * theEditionToolsPanel );
-// void setListViewPanel( wxContour_ListViewPanel * theListViewPanel );
-
-
////------------------------------------------------------------------------------------------------------------
//// Methods for capturing events
////------------------------------------------------------------------------------------------------------------
-
+
////------------------------------------------------------------------------------------------------------------
//// Model management methods
////------------------------------------------------------------------------------------------------------------
-
+
//------------------------------------------------------------------------------------------------------------
// Attributes getters and setters
//------------------------------------------------------------------------------------------------------------
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
//------------------------------------------------------------------------------------------------------------
/*
- ** 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<vtkImageData*>
*/
std::vector<vtkImageData*> getVectImages();
void onCreateContourRectangle( );
void onCreateContourCircle( );
void onCreateContourLine( );
+ void onCreateContourPoints( );
+ void onCreateContourPolygon( );
void onCreateContourBullEye(wxPanel* pan);
/////////////////////////////////
void onDeleteContour();
///////////////////////7
void onLoad();
void onSave();
-
- void openContours( FILE *pFile, int version, bool staticContour );
+ void onImport();
+ void onTest();
+ void openContours( FILE *pFile, FILE *pFileData, bool staticContour );
void RefreshInterface();
//AD
void onMirror();
- void onThreshold();
- void onThresholdChange();
- void onThresholdInterpolation(bool interpolate);
- void onThresholdChangeOpacity (int opacity);
- void onThresholdRemove();
-//====================================================================================================
- void showAxis(bool show);
+//====================================================================================================
+ void showAxis(bool show);
void onRigidPressed();
-
void onWidthOfContour(double width);
-
int getColorWindow();
int getWindowLevel();
-
void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel);
-
void onInterpolation(bool interpolate);
-
void onChangeInstant(std::string name,int actual);
-
void resetAppend();
-
void onSpreadAdd();
-
void onSpreadGo(int type);
-
void getInstantVector(std::vector<int>& tempVector);
-
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,
+ 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);
+ wxPanel *getThresholdImageViewPanel(wxWindow *parent);
+ wxPanel *getColorLayerImageViewPanel(wxWindow *parent);
-private:
- //------------------------------------------------------------------------------------------------------------
- // Private methods
- //------------------------------------------------------------------------------------------------------------
-
-
- //------------------------------------------------------------------------------------------------------------
- // Attributtes
- //------------------------------------------------------------------------------------------------------------
-
- static wxContourMainFrame* instance;
-
- KernelManagerContour* kernelManager;
-
- interfMainPanel* _pannew;
-
- PerformingOperation* _performingOperation;
-
- std::string _datadir;
+//CMRU 17-08-09-----------------------------------------------------------------------------------------------
- wxContourViewPanel* _theViewPanel;
-
- wxInstantChooserPanel * _instantPanel;
+ /**
+ * 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);
- //AD: 03-09: This attributes represents the reference line that is going to be used for the mirroring
- manualLineControler * _refLineControl;
- manualContourModelLine * _refLineModel;
- manualViewLine * _refLineView;
+ /**
+ * 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();
- wxAuiManager m_mgr;
- wxAuiNotebook * notebook;
+ /**
+ * Returns the size in pixels of the currently selected contour
+ */
+ double getContourSizeInPixels();
- long m_notebook_style;
- long m_notebook_theme;
- int _numberOfVariablesStatistics;
-
- vtkImageReslice * _imageReslicer;
- vtkLookupTable * _thresholdTable;
- vtkImageMapToColors * _thresholdMapper;
- vtkImageActor * _thresholdActor;
+ /**
+ * Returns the currently selected contour. If no contour is selected returns NULL
+ */
+ manualBaseModel* getContour();
- std::vector<vtkImageData*> _images;
+ /**
+ * Returns the Path of the data persistence file
+ */
+ std::string GetFileLocation();
- bool _actorPresent;
+ /**
+ * Assign a new path to the data persistence file
+ @ param newFileLocation New path of the file
+ */
+ void SetFileLocation(std::string newFileLocation);
+//------------------------------------------------------------------------------------------------------------
- //OutlineModelManager * _modelManager;
+ void SetScalarRange(int grayRangeMin, int grayRangeMax);
-
+//------------------------------------------------------------------------------------------------------------
- //wxContour_ButtonsBar * _buttonsBar;
+private:
+ //------------------------------------------------------------------------------------------------------------
+ // Private methods
+ //------------------------------------------------------------------------------------------------------------
- //wxContour_Grid * _gridPanel;
- //wxContour_DrawToolsPanel * _drawToolsPanel;
+ //------------------------------------------------------------------------------------------------------------
+ // Attributtes
+ //------------------------------------------------------------------------------------------------------------
- //wxContour_OperationsToolsPanel * _operationsToolsPanel;
+ int _contourGroup;
+ static wxContourMainFrame *instance;
+ KernelManagerContour *kernelManager;
+ interfMainPanel *_pannew;
+ PerformingOperation *_performingOperation;
+ std::string _datadir;
+ wxContourViewPanel *_theViewPanel;
+ wxInstantChooserPanel *_instantPanel;
- //wxContour_AutomaticFormsToolsPanel * _autoFormsPanel;
+ //AD: 03-09: This attributes represents the reference line that is going to be used for the mirroring
+ manualLineControler *_refLineControl;
+ manualContourModelLine *_refLineModel;
+ manualViewLine *_refLineView;
- //wxContour_StandardToolsPanel *_standardToolsPanel;
+ wxAuiManager m_mgr;
+ wxAuiNotebook *notebook;
+ long m_notebook_style;
+ long m_notebook_theme;
+ int _numberOfVariablesStatistics;
- //wxContour_EdtionToolsPanel * _editionToolsPanel;
+ // Contour Image Mask
+ ThresholdImageView *_viewMaskImage;
+ ThresholdImageViewPanel *_viewMaskImagePanel;
- //wxContour_ListViewPanel * _listViewPanel;
+ // Threshold Image
+ ThresholdImageView *_viewThresholdImage;
+ ThresholdImageViewPanel *_viewThresholdImagePanel;
- //wxVtkBaseView_SceneManager * _sceneManager;
+ // Color Layer Image
+ ColorLayerImageView *_viewColorLayerImage;
+ ColorLayerImageViewPanel *_viewColorLayerImagePanel;
+ std::vector<vtkImageData*> _images;
+ bool _actorPresent;
- //Instant * _actualInstant;
+ // temporary variables readding .roi file
+ int _tmpReadFileImageDim[3];
+ double _tmpReadFileImageSpac[3];
+ int _tmpReadFileTypeOfTransformation;
+ void readDimSpc(FILE *pFile);
-
/*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;
- manualContourModel * factoryManualContourModel(wxPanel* panel);
-
- ContourExtractData *_contourextractdata;
-
- void GenerateContourExtractData();
void saveState();
void loadState(std::string filename);
void loadContours( FILE *pFile, bool staticContour );
-
void saveFileWithContours( std::string filename );
-
- int inredo;
- int inundo;
- std::string stundoredo;
-
-
- static char COPY;
+ void onLoadContours(std::string fileNameContourROI);
+
+ 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;
+//------------------------------------------------------------------------------------------------------------
};
-#endif
+#endif
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff