DGtal-team · kerautret · Nov 7, 2016 · Oct 12, 2016 · Oct 12, 2016 · Oct 13, 2016
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -63,7 +63,6 @@ endif( Boost_FOUND )
 
 
 
-
 # -----------------------------------------------------------------------------
 # Documentation
 # -----------------------------------------------------------------------------
@@ -81,3 +80,4 @@ add_subdirectory(estimators)
 add_subdirectory(converters)
 add_subdirectory(visualisation)
 add_subdirectory(geometricTransform)
+add_subdirectory(imageProcessing)
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,9 @@
 # DGtalTools 0.9.3
 
+- *imageProcessing*:
+   - Creates imageProcessing directory. Add tools for doing image restoration and inpainting with Ambrosio-Tortorelli functional and discrete calculus. (Jacques-Olivier Lachaud, Marion Foare
+   [#280](https://github.com/DGtal-team/DGtalTools/pull/280))
+
 - *converters*:
    - fix tool itk2vol which was not able to read and convert int type image.
    (Bertrand Kerautret, [#276](https://github.com/DGtal-team/DGtalTools/pull/271))

diff --git a/README.md b/README.md
@@ -58,6 +58,9 @@ Actually the DGTal project is organized as follows:
  - [Volumetric](http://dgtal.org/doc/tools/nightly/volumetric.html#volumetric_Doc): 
    tools to manipulate volumetric files (marching cube, sub sampling, thinning)
 
+ - [ImageProcessing](http://dgtal.org/doc/tools/nightly/imageProcessing.html): 
+   tools to process images (image restoration, image inpainting)
+
 
 How to build the tools
 ======================

diff --git a/doc/doxy.config.in b/doc/doxy.config.in
@@ -780,7 +780,8 @@ INPUT                  = @top_srcdir@/doc \
                          @top_srcdir@/estimators \
                          @top_srcdir@/generators \
                          @top_srcdir@/geometricTransform \
-                         @top_srcdir@/volumetric
+                         @top_srcdir@/volumetric \
+                         @top_srcdir@/imageProcessing
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -881,7 +882,8 @@ EXAMPLE_RECURSIVE      = YES
 # that contain images that are to be included in the documentation (see the
 # \image command).
 
-IMAGE_PATH             = @top_srcdir@/doc/images
+IMAGE_PATH             = @top_srcdir@/doc/images \
+                         @top_srcdir@/doc/images/AT
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program

diff --git a/doc/imageprocessing.dox b/doc/imageprocessing.dox
@@ -0,0 +1,47 @@
+/**
+ * @file imageprocessing.dox
+ * @author Jacques-Olivier Lachaud (\c jacques-olivier.lachaud@univ-savoie.fr )
+ * Laboratory of Mathematics (CNRS, UMR 5127), University of Savoie, France
+ *
+ * @date 2016/10/15
+ *
+ * Documentation file for imageProcessing
+ *
+ * This file is part of the DGtal library.
+ */
+
+
+//----------------------------------------
+/*!
+@page imageProcessing Image processing
+@writers Jacques-Olivier Lachaud
+
+@section imageprocessing_Modules Modules of package image processing
+
+ - \ref moduleAT (Marion Foare, Jacques-Olivier Lachaud)
+
+
+@section imageprocessing_Doc Image restoration
+
+  - @ref DocATu2v0 : Computes a piecewise smooth approximation of an image, by optimizing the Ambrosio-Tortorelli functional (with u a 2-form and v a 0-form).
+  - @ref DocATu0v1 : Computes a piecewise smooth approximation of an image, by optimizing the Ambrosio-Tortorelli functional (with u a 0-form and v a 1-form).
+
+
+<center>
+<table>
+  <tr>
+        <td> 
+        <img height=200px src="lena-370-b02.png"> 
+        </td>
+        <td>
+        <img height=200px src="lena-370-b02-a0_48000-l0_0250000-u.png">
+        </td>
+</tr>
+<tr>
+        <td colspan=2 align = center>@ref DocATu2v0, @ref DocATu0v1 </td>
+</tr>
+</table>
+</center>
+
+
+*/
diff --git a/doc/images/AT/barbara-cropped-b01-l0.0054088-a1.0-u0-v1-u.png b/doc/images/AT/barbara-cropped-b01-l0.0054088-a1.0-u0-v1-u.png
diff --git a/doc/images/AT/carre2Degradesb02.png b/doc/images/AT/carre2Degradesb02.png
diff --git a/doc/images/AT/cb2-a0_01000-l1_0000000-u.png b/doc/images/AT/cb2-a0_01000-l1_0000000-u.png
diff --git a/doc/images/AT/cb2-a0_05000-l1_0000000-u.png b/doc/images/AT/cb2-a0_05000-l1_0000000-u.png
diff --git a/doc/images/AT/cb2-a0_10000-l1_0000000-u.png b/doc/images/AT/cb2-a0_10000-l1_0000000-u.png
diff --git a/doc/images/AT/cb2-a0_50000-l1_0000000-u.png b/doc/images/AT/cb2-a0_50000-l1_0000000-u.png
diff --git a/doc/images/AT/cb2-a1_00000-l1_0000000-u.png b/doc/images/AT/cb2-a1_00000-l1_0000000-u.png
diff --git a/doc/images/AT/cb2-e0_25-a0_10000-l0_0062092-u0-v1.png b/doc/images/AT/cb2-e0_25-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/AT/cb2-e0_5-a0_10000-l0_0062092-u0-v1.png b/doc/images/AT/cb2-e0_5-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/AT/cb2-e1_0-a0_10000-l0_0062092-u0-v1.png b/doc/images/AT/cb2-e1_0-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/AT/cb2-e2_0-a0_10000-l0_0062092-u0-v1.png b/doc/images/AT/cb2-e2_0-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/AT/cb2-e4_0-a0_10000-l0_0062092-u0-v1.png b/doc/images/AT/cb2-e4_0-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/AT/d-a0.10000-l0.0085000-u0-v1.png b/doc/images/AT/d-a0.10000-l0.0085000-u0-v1.png
diff --git a/doc/images/AT/d-a0.10000-l0.0085000-u2-v0.png b/doc/images/AT/d-a0.10000-l0.0085000-u2-v0.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_0125000-u-v.png b/doc/images/AT/lena-370-b02-a0_48000-l0_0125000-u-v.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_0125000-u.png b/doc/images/AT/lena-370-b02-a0_48000-l0_0125000-u.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_0250000-u-v.png b/doc/images/AT/lena-370-b02-a0_48000-l0_0250000-u-v.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_0250000-u.png b/doc/images/AT/lena-370-b02-a0_48000-l0_0250000-u.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_0500000-u-v.png b/doc/images/AT/lena-370-b02-a0_48000-l0_0500000-u-v.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_0500000-u.png b/doc/images/AT/lena-370-b02-a0_48000-l0_0500000-u.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_1000000-u-v.png b/doc/images/AT/lena-370-b02-a0_48000-l0_1000000-u-v.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_1000000-u.png b/doc/images/AT/lena-370-b02-a0_48000-l0_1000000-u.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_2000000-u-v.png b/doc/images/AT/lena-370-b02-a0_48000-l0_2000000-u-v.png
diff --git a/doc/images/AT/lena-370-b02-a0_48000-l0_2000000-u.png b/doc/images/AT/lena-370-b02-a0_48000-l0_2000000-u.png
diff --git a/doc/images/AT/lena-370-b02.png b/doc/images/AT/lena-370-b02.png
diff --git a/doc/images/Barbara_Crop_ATu0v1.png b/doc/images/Barbara_Crop_ATu0v1.png
diff --git a/doc/images/Barbara_Crop_ATu2v0.png b/doc/images/Barbara_Crop_ATu2v0.png
diff --git a/doc/images/Triangle_0_0011.png b/doc/images/Triangle_0_0011.png
diff --git a/doc/images/Triangle_0_0048.png b/doc/images/Triangle_0_0048.png
diff --git a/doc/images/Triangle_0_01.png b/doc/images/Triangle_0_01.png
diff --git a/doc/images/Triangle_0_1.png b/doc/images/Triangle_0_1.png
diff --git a/doc/images/barbara-cropped-b01-l0.0054088-a1.0-u0-v1-u.png b/doc/images/barbara-cropped-b01-l0.0054088-a1.0-u0-v1-u.png
diff --git a/doc/images/barbara-cropped-b01.png b/doc/images/barbara-cropped-b01.png
diff --git a/doc/images/carre2Degradesb02.png b/doc/images/carre2Degradesb02.png
diff --git a/doc/images/cb2-a0_01000-l1_0000000-u.png b/doc/images/cb2-a0_01000-l1_0000000-u.png
diff --git a/doc/images/cb2-a0_05000-l1_0000000-u.png b/doc/images/cb2-a0_05000-l1_0000000-u.png
diff --git a/doc/images/cb2-a0_10000-l1_0000000-u.png b/doc/images/cb2-a0_10000-l1_0000000-u.png
diff --git a/doc/images/cb2-a0_50000-l1_0000000-u.png b/doc/images/cb2-a0_50000-l1_0000000-u.png
diff --git a/doc/images/cb2-a1_00000-l1_0000000-u.png b/doc/images/cb2-a1_00000-l1_0000000-u.png
diff --git a/doc/images/cb2-e0_25-a0_10000-l0_0062092-u0-v1.png b/doc/images/cb2-e0_25-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/cb2-e0_5-a0_10000-l0_0062092-u0-v1.png b/doc/images/cb2-e0_5-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/cb2-e1_0-a0_10000-l0_0062092-u0-v1.png b/doc/images/cb2-e1_0-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/cb2-e2_0-a0_10000-l0_0062092-u0-v1.png b/doc/images/cb2-e2_0-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/cb2-e4_0-a0_10000-l0_0062092-u0-v1.png b/doc/images/cb2-e4_0-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/d-a0.10000-l0.0085000-u0-v1.png b/doc/images/d-a0.10000-l0.0085000-u0-v1.png
diff --git a/doc/images/d-a0.10000-l0.0085000-u2-v0.png b/doc/images/d-a0.10000-l0.0085000-u2-v0.png
diff --git a/doc/images/degrade-a0.05000-l0.0050000-u0-v1.png b/doc/images/degrade-a0.05000-l0.0050000-u0-v1.png
diff --git a/doc/images/degrade-a0.05000-l0.0050000-u0.png b/doc/images/degrade-a0.05000-l0.0050000-u0.png
diff --git a/doc/images/degrade-a0.05000-l0.0075000-u2-v0.png b/doc/images/degrade-a0.05000-l0.0075000-u2-v0.png
diff --git a/doc/images/degrade-a0.05000-l0.0075000-u2.png b/doc/images/degrade-a0.05000-l0.0075000-u2.png
diff --git a/doc/images/degrade-b04.png b/doc/images/degrade-b04.png
diff --git a/doc/images/degrade.png b/doc/images/degrade.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_0125000-u-v.png b/doc/images/lena-370-b02-a0_48000-l0_0125000-u-v.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_0125000-u.png b/doc/images/lena-370-b02-a0_48000-l0_0125000-u.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_0250000-u-v.png b/doc/images/lena-370-b02-a0_48000-l0_0250000-u-v.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_0250000-u.png b/doc/images/lena-370-b02-a0_48000-l0_0250000-u.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_0500000-u-v.png b/doc/images/lena-370-b02-a0_48000-l0_0500000-u-v.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_0500000-u.png b/doc/images/lena-370-b02-a0_48000-l0_0500000-u.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_1000000-u-v.png b/doc/images/lena-370-b02-a0_48000-l0_1000000-u-v.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_1000000-u.png b/doc/images/lena-370-b02-a0_48000-l0_1000000-u.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_1000000-u0-v1.png b/doc/images/lena-370-b02-a0_48000-l0_1000000-u0-v1.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_2000000-u-v.png b/doc/images/lena-370-b02-a0_48000-l0_2000000-u-v.png
diff --git a/doc/images/lena-370-b02-a0_48000-l0_2000000-u.png b/doc/images/lena-370-b02-a0_48000-l0_2000000-u.png
diff --git a/doc/images/lena-370-b02.png b/doc/images/lena-370-b02.png
diff --git a/doc/images/q2-d-a0_10000-l0_0620921-u.png b/doc/images/q2-d-a0_10000-l0_0620921-u.png
diff --git a/doc/images/q2-d2-a1.00000-l0.0100000-u2-v0.png b/doc/images/q2-d2-a1.00000-l0.0100000-u2-v0.png
diff --git a/doc/images/q2-d2-g-mask.png b/doc/images/q2-d2-g-mask.png
diff --git a/doc/images/q452-d-a0_10000-l0_0289664-u.png b/doc/images/q452-d-a0_10000-l0_0289664-u.png
diff --git a/doc/images/q452-d-a1.00000-l0.0250000-u2-v0.png b/doc/images/q452-d-a1.00000-l0.0250000-u2-v0.png
diff --git a/doc/images/q452-d-g-mask.png b/doc/images/q452-d-g-mask.png
diff --git a/doc/images/resATu0v1-cb2-a0_01000-l1_0000000-u.png b/doc/images/resATu0v1-cb2-a0_01000-l1_0000000-u.png
diff --git a/doc/images/resATu0v1-cb2-a0_05000-l1_0000000-u.png b/doc/images/resATu0v1-cb2-a0_05000-l1_0000000-u.png
diff --git a/doc/images/resATu0v1-cb2-a0_10000-l1_0000000-u.png b/doc/images/resATu0v1-cb2-a0_10000-l1_0000000-u.png
diff --git a/doc/images/resATu0v1-cb2-a0_50000-l1_0000000-u.png b/doc/images/resATu0v1-cb2-a0_50000-l1_0000000-u.png
diff --git a/doc/images/resATu0v1-cb2-a1_00000-l1_0000000-u.png b/doc/images/resATu0v1-cb2-a1_00000-l1_0000000-u.png
diff --git a/doc/images/resATu0v1-cb2-e0_25-a0_10000-l0_0062092-u0-v1.png b/doc/images/resATu0v1-cb2-e0_25-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/resATu0v1-cb2-e0_5-a0_10000-l0_0062092-u0-v1.png b/doc/images/resATu0v1-cb2-e0_5-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/resATu0v1-cb2-e1_0-a0_10000-l0_0062092-u0-v1.png b/doc/images/resATu0v1-cb2-e1_0-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/resATu0v1-cb2-e2_0-a0_10000-l0_0062092-u0-v1.png b/doc/images/resATu0v1-cb2-e2_0-a0_10000-l0_0062092-u0-v1.png
diff --git a/doc/images/triple-spirale-b02.png b/doc/images/triple-spirale-b02.png
diff --git a/doc/mainpage.dox b/doc/mainpage.dox
@@ -39,6 +39,8 @@ Actually the DGTal project is organized as follows:
 
  - [Volumetric](\ref volumetric_Doc)
 
+ - [Image Processing](\ref imageprocessing_Doc)
+
 
    <center>
     <table>
@@ -117,6 +119,20 @@ Actually the DGTal project is organized as follows:
            <td align = center>@ref volReSample </td>
 </tr>
 
+<tr bgcolor="#FAFFFA">
+    <td align = center colspan="3" vertical-align=middle> Example of tools of @ref imageProcessing : </td>
+   </tr>
+   <tr>
+   <td><img height=150px src="barbara-cropped-b01.png"> </td>
+   <td><img height=150px src="barbara-cropped-b01-l0.0054088-a1.0-u0-v1-u.png"></td>
+   <td></td>
+   </tr>
+      <tr>
+           <td align = center>Input image </td>
+           <td align = center>@ref DocATu2v0, @ref DocATu0v1 </td>
+           <td align = center> </td>
+      </tr>
+
   </table>
    </center>