doc for picture import and shape recognition

doc/salome/gui/GEOM/input/creating_sketcher.doc

@@ -8,7 +8,7 @@ The 2D Sketcher allows you to create a profile made of curves of 2 types: line s
 
 \image html sketch_example.png
 
-To create a \b 2D Sketch:
+To create a <b> 2D Sketch</b>:
 
 <ol>
 <li>In the main menu select <em>New Entity -> Basic -> 2D Sketch</em> or click on \image html sketch.png </li>

doc/salome/gui/GEOM/input/extruded_boss_operation.doc

@@ -8,18 +8,25 @@ The <b>Extruded boss</b> operation allows you to easily add material on a \b sol
 
 To produce the <b>extruded boss</b>:
 
-1. Draw the \b profile of the extrusion. It can be:
+<ol>
-
+<li>Draw the \b profile of the extrusion. It can be:
- - a <a href="create_sketcher_page.html">\b Sketch </a> drawn on a planar face of the object you want to boss.
  
- - any closed edge or wire of the desired shape (circle, ellipse ...).
+ <ul>
+ <li> a <a href="create_sketcher_page.html">\b Sketch </a> drawn on a planar face of the object you want to boss.</li>
+ 
+ <li> any closed edge or wire of the desired shape (circle, ellipse ...).</li>
+ </ul>
+ 
+</li>
 
-2. In the <b>Main Menu</b> select <b>Operations - > Extruded Boss</b> or click on 
+<li> In the <b>Main Menu</b> select <b>Operations - > Extruded Boss</b> or click on 
-\image html extruded_boss.png
+\image html extruded_boss.png </li>
 
-3. Fill in the dialog box fields:
+<li> Fill in the dialog box fields:
 
-\image html extruded_boss_dlg.png
+\image html extruded_boss_dlg.png </li>
+
+</ol>
 
 The input arguments are:
 

doc/salome/gui/GEOM/input/importing_picture.doc

@@ -0,0 +1,32 @@
+/*!
+
+\page import_picture_page Import a picture in the OCC viewer
+
+It's possible in GEOM to import a picture file in the OCC view.
+The supported formats are : .bmp, .gif, .pix, .xwd, .rgb, .rs
+
+
+The imported picture (engineering drawing, nautical chart ...) may be used then as a support for 2D shape design. 
+
+You can create a \ref create_sketcher_page "sketch" on the top of this picture or use the 
+\ref shape_recognition_page "Shape recognition" 
+functionnalities to build geometrical shapes out from some elements of the picture (contours, corners ...).
+
+To <b>import a picture</b> in the view:
+
+<ul>
+
+ <li> select <b>New Entity -> Import a picture in the view</b> or click on \image html import_picture.png </li>
+ 
+ <li> Click on <b>...</b> and browse your image files to select one of them</li>
+ 
+ <li> Apply</li>
+ 
+</ul>
+
+A new <b>Picture</b> object is created and pan, zoom and rotation operations are available in the view like for any other object.
+
+
+\image html picture_import_dlg.png
+
+*/

doc/salome/gui/GEOM/input/index.doc

@@ -18,8 +18,11 @@ various algorithms;</li>
  \subpage using_measurement_tools_page "measurement tools".</li>
 <li>easily setting parameters via the variables predefined in
  \subpage using_notebook_geom_page "Salome notebook".</li>
+<li>\subpage import_picture_page, such as engeneering drawings or nautical charts as a support for shape design.
+<li>\subpage shape_recognition_page previously imported in the OCC viewer .
 </ul>
 
+
 Almost all geometry module functionalities are accessible via
 \subpage geompy_page "Geometry module Python Interface"
 

doc/salome/gui/GEOM/input/shape_recognition.doc

@@ -0,0 +1,26 @@
+/*!
+
+\page shape_recognition_page Shape recognition from a picture
+
+\note This functionality is not fully operational yet. It is provided for testing purpose and because it might already be helpful in some situations. 
+
+This tool allows you to create geometrical shapes automatically out from pictures elements by performing shape recognition algorithms.
+<b>Contours</b> or <b>Corners</b> can be built.
+
+To use the <b>Shape recogition</b> tool you have to \ref import_picture_page "Import a picture" in the view first.Then you can choose to create either <b>contours</b> or <b>corners</b> out from this picture. 
+
+To create <b>Contours</b> :
+
+<ol>
+  <li> In the <b>Picture</b> field select a previously imported picture.</li>
+  
+  <li> Click on \image html occ_view_camera_dump.png </li>
+  
+  <li> Find a zone in the picture which color is representative of the zone you want to find the frontier of. Draw a rectangle on it to take a <b>Snapshot</b>.</li>
+  
+  <li> Apply </li>
+</ol>
+
+
+
+*/