X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourViewPanel.h;h=1ea6f2679af5a1a94340fc6952cd9ba0aa97d610;hb=9ff44b27d3213ad802523f2dd4eb8572f3551183;hp=ecc5c9721fc4e932c661019c0325cc58301cc756;hpb=28671ae02163f2b674da599a98a128f58dfead88;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
index ecc5c97..1ea6f26 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
@@ -75,34 +75,24 @@ ViewPanel.h */
 // Class definition
 //------------------------------------------------------------------------------------------------------------
 
-class wxContourViewPanel : public wxPanel {// public wxScrolledWindow {
-
+class wxContourViewPanel : public wxPanel 
+{
 	public:
-
 	//------------------------------------------------------------------------------------------------------------
 	// Constructors & Destructors
 	//------------------------------------------------------------------------------------------------------------
-	
 	wxContourViewPanel( vtkImageData * theShowingImage, wxWindow *parent, const wxPoint& pos=wxDefaultPosition, const wxSize& size = wxDefaultSize,long style= wxDEFAULT_FRAME_STYLE | wxSUNKEN_BORDER, int vertStart=1, int vertEnd=1, int horzStart=1, int horzEnd=1 );
-
 	~wxContourViewPanel();
-
 	//------------------------------------------------------------------------------------------------------------
 	// Creational and initialization methods
 	//------------------------------------------------------------------------------------------------------------
-	
 	void setWxEventHandler( wxEvtHandler * theEventHandler );
-
 	void createHorizontalBar(int horzStart, int horzEnd);
-
 	void createVerticalBar(int vertStart, int vertEnd);
-
 	void createViewPanel();
-
 	//------------------------------------------------------------------------------------------------------------
 	// Methods for capturing events from the horizontal bar
 	//------------------------------------------------------------------------------------------------------------
-	
 	/**
 	* Handles the event wxEVT_TSBAR from the horizontal bar	
 	*/
@@ -289,23 +279,19 @@ class wxContourViewPanel : public wxPanel {// public wxScrolledWindow {
 	* Gets the vertical concept name
 	* @return _verticalConcept The name of the concept for setting at the vertical bar
 	*/
-	std::string  getVerticalConceptName(  );
-
+	std::string  	getVerticalConceptName(  );
 	//------------------------------------------------------------------------------------------------------------
 	//  Other functional methods
 	//------------------------------------------------------------------------------------------------------------
-
-	void getSpacing( double * spacing );
-
-	wxVtkBaseView* getWxVtkBaseView();
-
-	double getCurrentDeep();
-	
-	void	SetVisibleAxis(bool ok);
-	int		GetX();
-	int		GetY();
-	int		GetZ();
-	void	Refresh();
+	void 			getSpacing( double * spacing );
+	wxVtkBaseView*	getWxVtkBaseView();
+	double 			getCurrentDeep();
+	void			SetVisibleAxis(bool ok);
+	int				GetX();
+	int				GetY();
+	int				GetZ();
+	void 			SetXY(int x, int y);
+	void			Refresh();
 
 
 //this method should be deleted
@@ -322,41 +308,27 @@ class wxContourViewPanel : public wxPanel {// public wxScrolledWindow {
 	void onStopCreateROI (wxCommandEvent& event);
 	void onChangedDeep (wxCommandEvent& event);
 	void onActionButtonPressed(wxCommandEvent& event);
-
 	void removeSceneContours();
 	void addNameWrapperToScene();
-	
 	std::vector<std::string> getSelectedObjects();
-
 	void RefreshInterface();
-
 	vtkImageData* getImageData();
-
 	void configureViewControlTo(std::string theName,manualBaseModel* manModelContour,double* spc,int typeofcontour);
-
-	int GetImageDataSizeZ();
-
+	int  GetImageDataSizeZ();
 	void GetImageDataRange(double *range);
-
 	void SetWidthContour(double width );
-
-	int getColorWindow();
-
-	int getWindowLevel();
-
+	int  getColorWindow();
+	int  getWindowLevel();
 	void onBrigthnessColorWindowLevel(int colorwindow,int windowlevel);
-
 	void onInterpolation(bool interpolate);
-
+	void onShowTextContour(bool show);
+	void onBeforeAfterContour(bool before, bool after);
 	void GetPointsOfActualContour( std::vector<double> *vecX, std::vector<double> *vecY, std::vector<double> *vecZ );
-
 	void changeImage(vtkImageData* img);
-
 	void changeDeep();
-
 	void setImageSlice(int z);
-private:
-	
+
+private:	
 	//------------------------------------------------------------------------------------------------------------
 	// Attributtes
 	//------------------------------------------------------------------------------------------------------------
@@ -387,6 +359,8 @@ private:
 	bool 							_useHorizontalBar;
 
 	wxEvtHandler 					*_eventHandler;
+	bool 							_showBeforeContour;
+	bool 							_showAfterContour;
 	
 //EED
 
@@ -396,7 +370,7 @@ private:
 
 	
 	
-	wxVtkMPR2DView * GetwxVtkMPR2DView();
+	wxVtkMPR2DView *GetwxVtkMPR2DView();
 
 
 //	DECLARE_CLASS(wxContourViewPanel)