X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FmaracasVisuLib%2Fsrc%2Finterface%2FwxWindows%2Fwidgets%2FThresholdImageView%2FColorLayerImageView.cxx;h=a512a272e1a30804c1a5ebd9c169e706628f1f87;hb=aa1986d6732437e9f55291e5cbe309aea9c7d3b8;hp=91a67553336ac103b545d42bd1bcba3a8f60c2c5;hpb=39a96dbeaae51405291ce243690d2fd63cd6e12d;p=creaMaracasVisu.git

diff --git a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
index 91a6755..a512a27 100644
--- a/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
+++ b/lib/maracasVisuLib/src/interface/wxWindows/widgets/ThresholdImageView/ColorLayerImageView.cxx
@@ -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 
  *  \author Eduardo Davila and Claire Mouton.
@@ -38,12 +63,59 @@ void ColorLayerImageView::SetSliceFixDynamic(bool fix_dynamic)
   _fix_dynamic = fix_dynamic;
 }
 
+//----------------------------------------------------------------------------
+void ColorLayerImageView::SetX2(int x2)  
+{
+  _x2 = x2;
+}
+
+//----------------------------------------------------------------------------
+void ColorLayerImageView::SetY2(int y2)  
+{
+  _y2 = y2;
+}
+
+
 //----------------------------------------------------------------------------
 void ColorLayerImageView::SetZ2(int z2)  
 {
   _z2 = z2;
 }
 
+
+
+//----------------------------------------------------------------------------
+int ColorLayerImageView::GetX() // virtual 
+{
+  int result=0;
+  if (_fix_dynamic==false)
+    {
+      result = _x2;
+    }
+  else
+    {
+      result = LayerImageBase::GetX();
+    }  
+
+  return result;
+}
+
+//----------------------------------------------------------------------------
+int ColorLayerImageView::GetY() // virtual 
+{
+  int result=0;
+  if (_fix_dynamic==false)
+    {
+      result = _y2;
+    }
+  else
+    {
+      result = LayerImageBase::GetY();
+    }  
+
+  return result;
+}
+
 //----------------------------------------------------------------------------
 int ColorLayerImageView::GetZ() // virtual 
 {
@@ -193,8 +265,13 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
 {
   // CM
   // Grey level extrema retrieved from the image grey level extrema.
-  GetImage()->GetScalarRange(_range);
 
+/*
+printf("ERROR: EED ColorLayerImageView::ConfigLookupTable   ------_range----------------\n");
+  _range[0]=0;
+  _range[1]=4000;
+*/
+  GetImage()->GetScalarRange(_range);
 
   // ------------------ Setting Default Values
   // Checks the size consistency of vectors _base_color and _grey_level_boundary.
@@ -217,8 +294,11 @@ void ColorLayerImageView::ConfigLookupTable()  // virtual
   vtkLookupTable* thresholdTable = GetThresholdTable();
 
   // CM Number of table values consistent with the effective number of values (see loop below).
-  thresholdTable->SetNumberOfTableValues(std::max( GetGreyLevelBoundaries( GetBaseColorNb() ), ceil(_range[1]) ) - std::min(  GetGreyLevelBoundaries(0), floor(_range[0]) ) + 1);
-  thresholdTable->SetTableRange(_range); 
+  double thresholdTable_range[2];
+  thresholdTable_range[1]= std::max( GetGreyLevelBoundaries( GetBaseColorNb() ), ceil(_range[1]) );
+  thresholdTable_range[0]= std::min( GetGreyLevelBoundaries(0), floor(_range[0]) );
+  thresholdTable->SetNumberOfTableValues(thresholdTable_range[1] - thresholdTable_range[0] + 1);
+  thresholdTable->SetTableRange(thresholdTable_range); 
   thresholdTable->SetAlphaRange(0, 1);
   thresholdTable->SetValueRange(0, 1);
   thresholdTable->SetSaturationRange(0, 0);