X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=bbtk%2Fsrc%2FbbmaracasvisuViewerNV.h;h=9d3eb7d0cba14bc1b2a3487ecf3a26babf77552e;hb=7237c161ca713d5054c9a5cd7dc7188d5ac65ae9;hp=5407a000de6057c7bedf2a2396a96a0aefb463c6;hpb=63e29db9f3acfd1893ee3314de1bafb6d3475beb;p=creaMaracasVisu.git

diff --git a/bbtk/src/bbmaracasvisuViewerNV.h b/bbtk/src/bbmaracasvisuViewerNV.h
index 5407a00..9d3eb7d 100644
--- a/bbtk/src/bbmaracasvisuViewerNV.h
+++ b/bbtk/src/bbmaracasvisuViewerNV.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.
+# ------------------------------------------------------------------------ */
+
 #ifdef _USE_WXWIDGETS_
 #ifndef __bbcreaMaracasVisuViewerNV_h_INCLUDED__
 #define __bbcreaMaracasVisuViewerNV_h_INCLUDED__
@@ -7,9 +32,15 @@
 #include "vtkRenderer.h"
 
 #include "wxVtkBaseView.h"
-#include "widgets/wxMPRWidget.h"
-#include "widgets/wxMaracas_ViewerWidget.h"
-#include "widgets/wxMaracas_N_ViewersWidget.h"
+
+//#include "widgets/wxMPRWidget.h"
+//#include "widgets/wxMaracas_ViewerWidget.h"
+//#include "widgets/wxMaracas_N_ViewersWidget.h"
+
+#include "wxMPRWidget.h"
+#include "wxMaracas_ViewerWidget.h"
+#include "wxMaracas_N_ViewersWidget.h"
+
 #include "vtkImagePlaneWidget.h"
 
 namespace bbcreaMaracasVisu
@@ -42,8 +73,8 @@ class /*BBTK_EXPORT*/ ViewerNV
   BBTK_DECLARE_INPUT(In, vtkImageData *);
   BBTK_DECLARE_INPUT(nTypeView, std::vector<int> );
   BBTK_DECLARE_INPUT(ColorFunction, vtkColorTransferFunction* );
-  BBTK_DECLARE_INPUT(WindowLevel, int );
-  BBTK_DECLARE_INPUT(ColorLevel, int );
+  BBTK_DECLARE_INPUT(WindowLevel, double );
+  BBTK_DECLARE_INPUT(ColorLevel, double );
   BBTK_DECLARE_INPUT(Obs1, vtkInteractorObserver *);
   BBTK_DECLARE_INPUT(Obs2, vtkInteractorObserver *);
   BBTK_DECLARE_INPUT(Obs3, vtkInteractorObserver *);
@@ -66,14 +97,13 @@ class /*BBTK_EXPORT*/ ViewerNV
   BBTK_CREATE_WIDGET(CreateWidget);
   void CreateWidget(wxWindow* parent);
 
-   std::vector<int>			point;
+   std::vector<int>				_point;
 private:
-	bool	firsttime;
-
-	vtkImageData* currentimg;
-	std::vector<int>  currenttype;
-	wxMaracas_N_ViewersWidget	*mwxwidget;
 
+	vtkImageData				*_currentimg;
+	std::vector<int>			_currenttype;
+	wxMaracas_N_ViewersWidget	*_mwxwidget;
+	
 	bool compareVectors(std::vector<int> type,std::vector<int> currenttype);
 	void updateObservers();
 };
@@ -87,8 +117,8 @@ BBTK_DESCRIPTION("Viewer : N view configuration 2D and 3D");
   BBTK_INPUT(ViewerNV,In,"Input image",vtkImageData*,"");
   BBTK_INPUT(ViewerNV,nTypeView,"vector of viewer types (default 5 1 2 0): -1=Z_2DwithOutAxis 0=Z_2D 1=X_2D 2=Y_2D 3=Plane 4=Sphere 5=3D 6=3Dplane 7=3D_empty",std::vector<int>,"");
   BBTK_INPUT(ViewerNV,ColorFunction,"Optional: set a different color for the viewers 2D",vtkColorTransferFunction*,"");
-  BBTK_INPUT(ViewerNV,WindowLevel,"Optional: set a different Window level by using an other widget",int,"");
-  BBTK_INPUT(ViewerNV,ColorLevel,"Optional: set a different Color level by using an other widget",int,"");
+  BBTK_INPUT(ViewerNV,WindowLevel,"Optional: set a different Window level by using an other widget",double,"");
+  BBTK_INPUT(ViewerNV,ColorLevel,"Optional: set a different Color level by using an other widget",double,"");
   BBTK_INPUT(ViewerNV,Obs1,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
   BBTK_INPUT(ViewerNV,Obs2,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");
   BBTK_INPUT(ViewerNV,Obs3,"Optional: set a different Color level by using an other widget",vtkInteractorObserver*,"");