X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FInterface_ManagerContour_NDimensions%2FwxContourViewPanel.h;h=59011577de3225012eadad1e7c8e0558595fffd3;hb=9c3e9dac7175adc08659330ec8b10233b467bd2d;hp=4b688478afa05f0f15330f341ce184eef9d25c7c;hpb=dfdd7c80dbd20fea642090201b64eb7119a144bf;p=creaContours.git

diff --git a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
index 4b68847..5901157 100644
--- a/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
+++ b/lib/Interface_ManagerContour_NDimensions/wxContourViewPanel.h
@@ -1,3 +1,28 @@
+/*# ---------------------------------------------------------------------
+#
+# Copyright (c) CREATIS (Centre de Recherche en Acquisition et Traitement de l'Image
+#                        pour la Sant�)
+# Authors : Eduardo Davila, Frederic Cervenansky, Claire Mouton
+# Previous Authors : Laurent Guigues, Jean-Pierre Roux
+# CreaTools website : www.creatis.insa-lyon.fr/site/fr/creatools_accueil
+#
+#  This software is governed by the CeCILL-B license under French law and
+#  abiding by the rules of distribution of free software. You can  use,
+#  modify and/ or redistribute the software under the terms of the CeCILL-B
+#  license as circulated by CEA, CNRS and INRIA at the following URL
+#  http://www.cecill.info/licences/Licence_CeCILL-B_V1-en.html
+#  or in the file LICENSE.txt.
+#
+#  As a counterpart to the access to the source code and  rights to copy,
+#  modify and redistribute granted by the license, users are provided only
+#  with a limited warranty  and the software's author,  the holder of the
+#  economic rights,  and the successive licensors  have only  limited
+#  liability.
+#
+#  The fact that you are presently reading this means that you have had
+#  knowledge of the CeCILL-B license and that you accept its terms.
+# ------------------------------------------------------------------------ */
+
 #ifndef __wxContourViewPaneL_h_INCLUDED_H__
 #define __wxContourViewPaneL_h_INCLUDED_H__
 
@@ -50,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	
 	*/
@@ -280,6 +295,7 @@ class wxContourViewPanel : public wxPanel {// public wxScrolledWindow {
 	int		GetX();
 	int		GetY();
 	int		GetZ();
+	void 	SetXY(int x, int y);
 	void	Refresh();
 
 
@@ -330,44 +346,40 @@ class wxContourViewPanel : public wxPanel {// public wxScrolledWindow {
 	void changeDeep();
 
 	void setImageSlice(int z);
+
+
 private:
 	
 	//------------------------------------------------------------------------------------------------------------
 	// Attributtes
 	//------------------------------------------------------------------------------------------------------------
-	wxVtkBaseView_SceneManager* _sceneManager;
+	wxVtkBaseView_SceneManager		*_sceneManager;
 	/*
 	* Represents the outer sizer of the ContourViewPanel
 	*/
-	wxFlexGridSizer* outSizer;
+	wxFlexGridSizer					*outSizer;
 
 	/*
 	* Represents the panel for viewing
 	*/
-	wxMaracas_N_ViewersWidget * theViewPanel;
+	wxMaracas_N_ViewersWidget		*theViewPanel;
 	/*
 	* Represents the vertical barrange
 	*/
-	mBarRange * _verticalBar;
+	mBarRange						*_verticalBar;
 
 	/*
 	* Represents the horizontal barrange
 	*/
-	mBarRange * _horizontalBar;
-
-	vtkImageData * showingVID;	
+	mBarRange 						*_horizontalBar;
+	vtkImageData 					*showingVID;	
+	std::string 					_verticalConceptName;
+	std::string 					_horizontalConceptName;
+	double 							last_spacing[3];
+	bool 							_useVerticalBar;
+	bool 							_useHorizontalBar;
 
-	std::string _verticalConceptName;
-
-	std::string _horizontalConceptName;
-
-	double last_spacing[3];
-
-	bool _useVerticalBar;
-
-	bool _useHorizontalBar;
-	
-	wxEvtHandler * _eventHandler;
+	wxEvtHandler 					*_eventHandler;
 	
 //EED