Fixing various date problems

DGtal-team · Apr 7, 2015 · cc46a92 · cc46a92
1 parent 814b699
commit cc46a92
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/examples/geometry/volumes/distance/distancetransform2D.cpp b/examples/geometry/volumes/distance/distancetransform2D.cpp
@@ -147,7 +147,7 @@ int main()
   //Explicit export with ticked colormap
   //We compute the maximum DT value on the L2 map
   board.clear();
-  TickedColorMap<double, GradientColorMap<double> > ticked(0.0,maxv2);
+  TickedColorMap<double, GradientColorMap<double> > ticked(0.0,maxv2, Color::White);
   ticked.addRegularTicks(5, 0.5);
   ticked.finalize();
   ticked.colormap()->addColor( Color::Red );

diff --git a/src/DGtal/io/colormaps/TickedColorMap.h b/src/DGtal/io/colormaps/TickedColorMap.h
@@ -19,9 +19,9 @@
 /**
  * @file TickedColorMap
  * @author David Coeurjolly (\c david.coeurjolly@liris.cnrs.fr )
- * Groupe de Recherche en Informatique, Image, Automatique et Instrumentation de Caen - GREYC (CNRS, UMR 6072), ENSICAEN, France
+ * Laboratoire d'InfoRmatique en Image et Systemes d'information - LIRIS (CNRS, UMR 5205), CNRS, France
  *
- * @date 2010/07/19
+ * @date 2015/04/06
  *
  * Header file for module TickedColorMap.cpp
  *
@@ -68,6 +68,8 @@ namespace DGtal
    * ticks with regular spacing, or locate zero-crossing of a curvature map
    * for instance (i.e. with a single tick at zero).
    *
+   * This class is a model of concepts::CColorMap
+   *
    * @tparam TValue The type of the range values.
    * @tparam TColorMap The type of colormap to Adapt (the value type of TColorMap must be TValue).
    *
@@ -137,7 +139,7 @@ namespace DGtal
 
     /**
      * Add a tick at a given position of the
-     * range.
+     * range [myMin, myMax].
      *
      * @param position tick position.
      * @param thickness tick thickness.
@@ -146,7 +148,7 @@ namespace DGtal
                  const Value thickness);
 
     /**
-     * Add regular ticks in the range.
+     * Add regularly spaced ticks in the range [myMin,myMax].
      *
      * @param nbTicks the number of regular ticks.
      * @param thickness ticks thickness.

diff --git a/src/DGtal/io/colormaps/TickedColorMap.ih b/src/DGtal/io/colormaps/TickedColorMap.ih
@@ -17,9 +17,9 @@
 /**
  * @file TickedColorMap.ih
  * @author Sebastien Fourey (\c Sebastien.Fourey@greyc.ensicaen.fr )
- * Groupe de Recherche en Informatique, Image, Automatique et Instrumentation de Caen - GREYC (CNRS, UMR 6072), ENSICAEN, France
+ * Laboratoire d'InfoRmatique en Image et Systemes d'information - LIRIS (CNRS, UMR 5205), CNRS, France
  *
- * @date 2010/07/19
+ * @date 2015/04/06
  *
  * Implementation of inline methods defined in TickedColorMap.h
  *
@@ -151,6 +151,9 @@ inline
 void DGtal::TickedColorMap<Value,CMAP>::addTick(const Value tick,
                                     const Value thickness)
 {
+  ASSERT( tick >= myMin );
+  ASSERT( tick <= myMax );
+
   myTicks.push_back(std::make_pair(tick,thickness));
 }