X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageView.h;h=305afdc15188853f5ff389aa743fef3e24a0972a;hb=313783230a81f37f703080f75dde71abb5497c43;hp=d1ec556f7d30000ef5df6320c6260ffb03d930f4;hpb=9cb8780edf257c286336c7355ecac466f07bbbc5;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h
index d1ec556..305afdc 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.h
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.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.
+# ------------------------------------------------------------------------ */
+
 /**
  *  \file 
  *  \brief Class ThresholdImageView . 
@@ -20,7 +45,11 @@ class  ColorLayerImageView : public LayerImageBase
 	  ColorLayerImageView( );
 	  ~ColorLayerImageView( );
 	  void SetSliceFixDynamic(bool fix_dynamic);
+	  void SetX2(int x2);
+	  void SetY2(int y2);
 	  void SetZ2(int z2);
+	  virtual int GetX();
+	  virtual int GetY();
 	  virtual int GetZ();
 	  
 	  /** 
@@ -29,6 +58,11 @@ class  ColorLayerImageView : public LayerImageBase
 	   * \param base_color the base color vector.
 	   */
 	  void SetBaseColors(std::vector<double> & base_color);
+
+
+	  void SetBaseTransparence(std::vector<double> & base_transparence);
+
+
 	  /** 
 	   * \brief  Returns the base color for a given index (first coordinate of the first color being 1, second coordinate of the first color being 2, etc.).
 	   *
@@ -62,13 +96,21 @@ class  ColorLayerImageView : public LayerImageBase
 	   */
 	  int GetBaseColorNb();
 
+
+		void 	FillColorTable(int start, int end, double r1, double g1, double b1, double r2, double g2, double b2, double t1, double t2);
+
+		int 	GrayLevel_TO_colorTableIndex( double VALUE );
+
+
   private:
 
-	  int _z2;
+	  int _x2, _y2, _z2;
 	  bool _fix_dynamic;
 	  void SetDefaultGreyLevelBoundary();
 	  void SetDefaultBaseColorAndGreyLevelBoundary();
 	  virtual void ConfigLookupTable();
+     int maxColorsThresholdTable;
+
 
 	  //! Range values in the colored image.
 	  double _range[2];
@@ -77,6 +119,8 @@ class  ColorLayerImageView : public LayerImageBase
 	  std::vector<double> _base_color;
 	  //! Grey level boundaries.
 	  std::vector<double> _grey_level_boundary;
+	  //! Grey level boundaries.
+	  std::vector<double> _transparence_level_boundary;
 	  //! Color type (plain or gradient color).
 	  bool _color_type;