//#include "wxVtkBaseView_SceneManager.h"
#include "wxInstantChooserPanel.h"
#include "wxContourViewPanel.h"
-#include "wxThresholdPanel.h"
-
-
//#include "ContourWorkspace.h"
#include "ContourExtractData.h"
#include "PerformingOperation.h"
+#include "manualLineControler.h"
+#include "manualContourModelLine.h"
+#include "manualViewLine.h"
+
+#include "ThresholdImageView.h"
+#include "ThresholdImageViewPanel.h"
+//EED #include "ColorLayerImageView.h"
+//EED #include "ColorLayerImageViewPanel.h"
//#include "ContourThing.h"
// Creational and initialization methods
//------------------------------------------------------------------------------------------------------------
- void setVectImages( std::vector<vtkImageData*> images );
+ void setVectImages(std::vector<vtkImageData*> imgs);
bool configurePanels( );
+ bool addNewPanel(wxPanel* panel);
+
wxAuiNotebook * createNotebook();
void createInstantChooserPanel(wxAuiNotebook * parent);
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);
+ void ShowToolsPanel(bool show);
+
// void setButtonsBar( wxContour_ButtonsBar * theButtonsBar );
// void setGrid( wxContour_Grid * theGridPanel );
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
//------------------------------------------------------------------------------------------------------------
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, bool staticContour );
+ void onImport();
+ void onTest();
+ void openContours( FILE *pFile, FILE *pFileData, int version, bool staticContour );
void RefreshInterface();
//AD
void onMirror();
-
- void onThreshold(int minVal, int maxVal);
-
- bool onThresholdPanel(wxPanel* panel);
-
+
+
//====================================================================================================
void showAxis(bool show);
std::vector<std::string> 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);
+ 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 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
// Attributtes
//------------------------------------------------------------------------------------------------------------
+ int _contourGroup;
+
static wxContourMainFrame* instance;
KernelManagerContour* kernelManager;
wxAuiManager m_mgr;
- /*
- wxArrayString m_perspectives;
- wxMenu* m_perspectives_menu;
- */
-
- wxAuiNotebook * notebook;
- long m_notebook_style;
- long m_notebook_theme;
- int _numberOfVariablesStatistics;
-
- //OutlineModelManager * _modelManager;
+ wxAuiNotebook * notebook;
+ long m_notebook_style;
+ long m_notebook_theme;
+ int _numberOfVariablesStatistics;
- //wxContour_ButtonsBar * _buttonsBar;
-
- //wxContour_Grid * _gridPanel;
-
- //wxContour_DrawToolsPanel * _drawToolsPanel;
-
- //wxContour_OperationsToolsPanel * _operationsToolsPanel;
-
- //wxContour_AutomaticFormsToolsPanel * _autoFormsPanel;
-
- //wxContour_StandardToolsPanel *_standardToolsPanel;
-
- //wxContour_EdtionToolsPanel * _editionToolsPanel;
-
- //wxContour_ListViewPanel * _listViewPanel;
+ // Contour Image Mask
+ ThresholdImageView *_viewMaskImage;
+ ThresholdImageViewPanel *_viewMaskImagePanel;
+
+ // Threshold Image
+ ThresholdImageView *_viewThresholdImage;
+ ThresholdImageViewPanel *_viewThresholdImagePanel;
+
+ // Color Layer Image
+//EED ColorLayerImageView *_viewColorLayerImage;
+//EED ColorLayerImageViewPanel *_viewColorLayerImagePanel;
+ wxPanel *_viewColorLayerImagePanel;
- //wxVtkBaseView_SceneManager * _sceneManager;
+ std::vector<vtkImageData*> _images;
- //Instant * _actualInstant;
+ bool _actorPresent;
+
+
/*DECLARE_CLASS(wxContourMainFrame)
// any class wishing to process wxWindows events must use this macro
//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;
static char COPY;
+//CMRU 17-08-09-----------------------------------------------------------------------------------------------
+ wxWindow *infoWin2;
+ wxPanel *calibrationPanel;
+ wxPanel *calibrationPanelError;
+ double _onePixelSize;
+ std::string _imageLocation;
+ std::string _fileLocation;
+//------------------------------------------------------------------------------------------------------------
+
};
#endif
git://git.creatis.insa-lyon.fr / creaContours.git / blobdiff