Merge branch 'fbt/addAngleInCylPrimitive'

[modules/geom.git] / doc / salome / gui / GEOM / input / import_export.doc

diff --git a/doc/salome/gui/GEOM/input/import_export.doc b/doc/salome/gui/GEOM/input/import_export.doc
index 62a80da55aeeb67486bb1da45c78809c1fc3e551..50b79203064ef34c7ac81faabc61c7d22e630ddb 100644 (file)
--- a/doc/salome/gui/GEOM/input/import_export.doc
+++ b/doc/salome/gui/GEOM/input/import_export.doc
@@ -3,17 +3,23 @@
 \page import_export_geom_obj_page Importing/exporting geometrical objects
 
 In Geometry module you can import and export geometrical objects
 \page import_export_geom_obj_page Importing/exporting geometrical objects
 
 In Geometry module you can import and export geometrical objects

-from/into BREP, IGES, STEP files. The mechanisms of import and export
+from/into BREP, IGES, STEP, ACIS and STL files. The mechanisms of import and export

 are implemented via plug-ins, which gives the opportunity to
 expand the range of available formats by adding more plug-ins (for
 example, CATIA 5).
 
 are implemented via plug-ins, which gives the opportunity to
 expand the range of available formats by adding more plug-ins (for
 example, CATIA 5).
 

-<em>To import geometrical objects from a BREP, IGES, STEP file:</em>
+The \subpage xao_format_page "import and export of shapes in XAO format" is implemented differently.
+
+\note If a plugin supports import of materials associated with shapes, these
+shapes are grouped corresponding to the imported materials. For the moment STEP
+import is the only plugin that supports this feature.
+
+<em>To import geometrical objects from a BREP, IGES, STEP, ACIS or STL file:</em>

 
 \par
 From the \b File menu choose \b Import. In the opening dialog box \b Import
 select the required format of the file for importation and search for
 
 \par
 From the \b File menu choose \b Import. In the opening dialog box \b Import
 select the required format of the file for importation and search for

-a *.brep, *.iges or *.step  file.
+a *.brep, *.iges, *.step, *.sat or *.stl file.

 
 \image html geomimport.png
 
 
 \image html geomimport.png
 


@@ -49,7 +55,7 @@ as before this operation.
 
 \image html geomimport_reopen.png
 
 
 \image html geomimport_reopen.png
 

-\n <em>To export geometrical objects into a BREP, IGES, STEP
+\n <em>To export geometrical objects into a BREP, IGES, STEP, ACIS or STL

 file:</em>
 
 \par
 file:</em>
 
 \par