Merge with PAL/SALOME 2.1.0d

Makefile.in

@@ -168,7 +168,8 @@ block_multitrsf_simple.png \
 tree_block.png \
 subblock.png \
 group_new.png \
-group_edit.png
+group_edit.png \
+glue.png
 
 BIN_SCRIPT= \
 VERSION

doc/salome/gui/GEOM/GEOM.log

@@ -1,5 +1,5 @@
 |SourceProjectName:GEOM.hpr
-|DestinationProjectName:geom_help.html
+|DestinationProjectName:geom.html
 whhost.js
 whmsg.js
 whmozemu.js
@@ -124,9 +124,9 @@ wht_toc3.gif
 whskin_frmset010.htm
 whst_topics.xml
 whskin_frmset01.htm
-geom_help_hha.hhk
+geom_hha.hhk
-geom_help.hhc
+geom.hhc
-geom_help.hhk
+geom.hhk
 blocks.htm
 changing_displaying_parameters.htm
 files\introduction_to_geom.htm
@@ -144,201 +144,23 @@ files\salome2_sp3_transformationgui_functions.htm
 newentity_blocks.htm
 sketcher.htm
 working_with_groups.htm
-geom_help.glo
+geom.glo
 default.css
-image194.jpg
+image61.gif
-image183.jpg
+image191.jpg
-image172.jpg
+image180.jpg
-image44.gif
+image109.jpg
-image161.jpg
-image150.jpg
-image22.gif
-image69.jpg
-image58.jpg
-image11.gif
-image14.jpg
-files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image133.gif
-files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image75.gif
-salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image13.gif
-image56.gif
-image184.jpg
-image173.jpg
-image151.jpg
-image140.jpg
-image23.gif
-image59.jpg
-image26.jpg
-image12.gif
-image15.jpg
-image2.gif
-image5.jpg
-files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image76.gif
-salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image14.gif
-image57.gif
-image185.jpg
-image163.jpg
-image152.jpg
-image35.gif
-image141.jpg
-image130.jpg
-image24.gif
-image27.jpg
-image13.gif
-image16.jpg
-files\salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image121.gif
-files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image90.gif
-files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image77.gif
-files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image30.gif
-salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image15.gif
-image186.jpg
-image175.jpg
-image164.jpg
-image142.jpg
-image25.gif
-image131.jpg
-image120.jpg
-image28.jpg
-image14.gif
-image17.jpg
-image7.jpg
-image4.gif
-files\salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image122.gif
-files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image100.gif
-files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image99.gif
-files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image78.gif
-files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image31.gif
-salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image16.gif
-image187.jpg
-image176.jpg
-image165.jpg
-image154.jpg
-image37.gif
-image132.jpg
-image121.jpg
-image110.jpg
-image15.gif
-image29.jpg
-image18.jpg
-image8.jpg
-image5.gif
-files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image101.gif
-files\salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image56.gif
-files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image1.gif
-files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image32.gif
-salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image17.gif
-image188.jpg
-image49.gif
-image166.jpg
-image144.jpg
-image133.jpg
-image122.jpg
-image111.jpg
-image100.jpg
-image90.jpg
-image16.gif
-image19.jpg
-image9.jpg
-image6.gif
-files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image102.gif
-files\salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image57.gif
-files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image2.gif
-files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image33.gif
-salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image18.gif
-image189.jpg
-image167.jpg
-image156.jpg
-image145.jpg
-image134.jpg
-image123.jpg
-image112.jpg
-image101.jpg
-image91.jpg
-image80.jpg
-image17.gif
-image7.gif
-files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image128.gif
-files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image103.gif
-files\salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image58.gif
-files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image3.gif
-files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image34.gif
-salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image19.gif
-i_blue.jpg
-image179.jpg
-image29.gif
-image168.jpg
-image146.jpg
-image135.jpg
-image124.jpg
-image113.jpg
-image102.jpg
-image92.jpg
-image81.jpg
-image70.jpg
-image8.gif
-files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image129.gif
-files\salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image59.gif
-files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image4.gif
-image169.jpg
-image158.jpg
-image147.jpg
-image136.jpg
-image125.jpg
-image103.jpg
-image93.jpg
-image82.jpg
-image71.jpg
-image19.gif
-image60.jpg
-image9.gif
-image137.jpg
-image126.jpg
-image115.jpg
-image104.jpg
-image94.jpg
-image83.jpg
-image72.jpg
-image61.jpg
-image149.jpg
-image138.jpg
-image127.jpg
-image116.jpg
-image105.jpg
-image95.jpg
-image84.jpg
-image73.jpg
-image62.jpg
-image51.jpg
-files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image51.gif
-files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image87.gif
-files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image27.gif
-image139.jpg
-image128.jpg
-image117.jpg
-image106.jpg
-image96.jpg
-image85.jpg
-image74.jpg
-image63.jpg
-image52.jpg
-files\salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image119.gif
-files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image88.gif
-files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image52.gif
-files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image28.gif
-image129.jpg
-image118.jpg
-image107.jpg
 image97.jpg
 image86.jpg
 image75.jpg
 image53.jpg
 image20.jpg
-files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image89.gif
+files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image131.gif
-files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image53.gif
+files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image31.gif
-files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image29.gif
+image192.jpg
-image190.jpg
+image181.jpg
 image51.gif
-image119.jpg
+image170.jpg
-image108.jpg
 image98.jpg
 image87.jpg
 image76.jpg
@@ -346,27 +168,33 @@ image65.jpg
 image54.jpg
 image21.jpg
 image10.jpg
-files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image71.gif
+files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image132.gif
-files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image54.gif
+files\salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image121.gif
-image191.jpg
+files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image32.gif
-image180.jpg
+image193.jpg
+image182.jpg
 image52.gif
+image171.jpg
+image160.jpg
 image41.gif
-image109.jpg
 image99.jpg
 image88.jpg
 image66.jpg
 image55.jpg
 image22.jpg
 image11.jpg
-files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image130.gif
+files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image133.gif
-files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image72.gif
+files\salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image122.gif
-files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image55.gif
+files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image87.gif
-image192.jpg
+image3.jpg
-image181.jpg
+files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image33.gif
+image194.jpg
+image183.jpg
 image53.gif
-image170.jpg
+image172.jpg
 image42.gif
+image161.jpg
+image150.jpg
 image89.jpg
 image78.jpg
 image20.gif
@@ -374,24 +202,208 @@ image67.jpg
 image56.jpg
 image23.jpg
 image12.jpg
-files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image131.gif
+files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image88.gif
-files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image73.gif
+files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image1.gif
-image193.jpg
+files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image34.gif
-image182.jpg
+image184.jpg
-image171.jpg
+image173.jpg
-image160.jpg
+image151.jpg
 image32.gif
+image140.jpg
 image79.jpg
 image21.gif
 image68.jpg
 image57.jpg
 image24.jpg
 image13.jpg
-files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image132.gif
+image2.gif
+image5.jpg
+files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image89.gif
+files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image2.gif
+image196.jpg
+image185.jpg
+image44.gif
+image163.jpg
+image152.jpg
+image141.jpg
+image130.jpg
+image22.gif
+image69.jpg
+image58.jpg
+files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image51.gif
+image11.gif
+image14.jpg
+files\salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image56.gif
+files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image3.gif
+image197.jpg
+image56.gif
+image186.jpg
+image175.jpg
+image164.jpg
+image142.jpg
+image131.jpg
+image23.gif
+image120.jpg
+image59.jpg
+image26.jpg
+image12.gif
+image15.jpg
+image7.jpg
+image4.gif
+files\salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image57.gif
+files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image52.gif
+files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image4.gif
+salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image13.gif
+image57.gif
+image187.jpg
+image176.jpg
+image165.jpg
+image154.jpg
+image35.gif
+image132.jpg
+image24.gif
+image121.jpg
+image110.jpg
+image27.jpg
+image13.gif
+image16.jpg
+image8.jpg
+image5.gif
+files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image71.gif
+files\salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image58.gif
+files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image53.gif
+files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image27.gif
+salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image14.gif
+image199.jpg
+image188.jpg
+image166.jpg
+image144.jpg
+image133.jpg
+image25.gif
+image122.jpg
+image111.jpg
+image100.jpg
+image28.jpg
+image14.gif
+image17.jpg
+image9.jpg
+image6.gif
+files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image128.gif
+files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image72.gif
+files\salome2_sp3_generationgui_functions_salome2_sp3_generationgui_functions_image59.gif
+files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image54.gif
+files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image28.gif
+salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image15.gif
+i_blue.jpg
+image200.jpg
+image59.gif
+image189.jpg
+image167.jpg
+image156.jpg
+image37.gif
+image145.jpg
+image134.jpg
+image123.jpg
+image112.jpg
+image101.jpg
+image15.gif
+image29.jpg
+image18.jpg
+image7.gif
+files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image129.gif
+files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image73.gif
+files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image55.gif
+files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image29.gif
+salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image16.gif
+image201.jpg
+image179.jpg
+image49.gif
+image168.jpg
+image146.jpg
+image135.jpg
+image124.jpg
+image113.jpg
+image102.jpg
+image90.jpg
+image16.gif
+image19.jpg
+image8.gif
+files\salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image119.gif
+files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image100.gif
 files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image74.gif
-image3.jpg
+salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image17.gif
+image202.jpg
+image169.jpg
+image158.jpg
+image147.jpg
+image136.jpg
+image125.jpg
+image103.jpg
+image91.jpg
+image80.jpg
+image17.gif
+image9.gif
+files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image101.gif
+files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image90.gif
+files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image75.gif
+salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image18.gif
+image203.jpg
+image29.gif
+image137.jpg
+image126.jpg
+image115.jpg
+image104.jpg
+image92.jpg
+image81.jpg
+image70.jpg
+files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image102.gif
+files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image99.gif
+files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image76.gif
+salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image19.gif
+image204.jpg
+image149.jpg
+image138.jpg
+image127.jpg
+image116.jpg
+image105.jpg
+image93.jpg
+image82.jpg
+image71.jpg
+image19.gif
+image60.jpg
+files\salome2_sp3_primitivegui_functions_salome2_sp3_primitivegui_functions_image103.gif
+files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image77.gif
+image205.jpg
+image139.jpg
+image128.jpg
+image117.jpg
+image106.jpg
+image94.jpg
+image83.jpg
+image72.jpg
+image61.jpg
+files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image78.gif
+image206.jpg
+image129.jpg
+image118.jpg
+image107.jpg
+image95.jpg
+image84.jpg
+image73.jpg
+image62.jpg
+image51.jpg
+image190.jpg
+image119.jpg
+image108.jpg
+image96.jpg
+image85.jpg
+image74.jpg
+image63.jpg
+image52.jpg
+files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image130.gif
+files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image30.gif
 ehlpdhtm.js
-geom_help.ppf
+geom.ppf
 default_ns.css
 whdata\whtdata0.xml
 whdata\whtdata0.htm
@@ -437,6 +449,6 @@ whgdata\whlstf3.htm
 whgdata\whlstf4.htm
 whgdata\whlstf5.htm
 whgdata\whlstg0.htm
-geom_help.html
+geom.html
-geom_help_csh.html
+geom_csh.html
-geom_help_rhc.html
+geom_rhc.html

doc/salome/gui/GEOM/blocks.htm

@@ -86,7 +86,7 @@ if (window.gbWhTopic)
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("geom_help.html");
+	setRelStartPage("geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/changing_displaying_parameters.htm

@@ -100,7 +100,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("geom_help.html");
+	setRelStartPage("geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/introduction_to_geom.htm

@@ -94,7 +94,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm

@@ -29,8 +29,8 @@
 <meta name=filetype content=kadov>
 <meta name=filetype-version content=1>
 <meta name=page-count content=1>
-<meta name=layout-height content=7535>
+<meta name=layout-height content=8407>
-<meta name=layout-width content=684>
+<meta name=layout-width content=778>
 
 
 <!--(Links)=========================================================-->
@@ -64,43 +64,82 @@ p.whs4 {font-size: 12pt;}
 p.whs5 {margin-left: 40px;}
 p.whs6 {font-family: 'Times New Roman', serif; font-size: 14pt;}
 img_whs7 {border-style: none; width: 20px; height: 20px;}
-p.whs8 {font-size: 12pt; margin-left: 40px;}
+table.whs8 {x-cell-content-align: top; border-spacing: 0; width: 84.306%; border-spacing: 0px;}
-img_whs9 {border-style: none; border: none; width: 200px; height: 176px;}
+col.whs9 {width: 33.333%;}
-p.whs10 {color: #808080; font-size: 12pt;}
+col.whs10 {width: 28.501%;}
-p.whs11 {font-size: 12pt; color: #000000;}
+col.whs11 {width: 31.796%;}
-p.whs12 {color: #808080; font-size: 12pt; margin-left: 40px;}
+tr.whs12 {x-cell-content-align: top;}
-img_whs13 {border-style: none; border: none; width: 150px; height: 140px;}
+td.whs13 {width: 33.333%; padding-right: 10px; padding-left: 10px; border-right-style: none; border-left-style: none; border-top-style: none; border-bottom-style: none;}
-img_whs14 {border-style: none; border: none; width: 150px; height: 139px;}
+img_whs14 {border-style: none; border: none; width: 218px; height: 250px;}
-img_whs15 {border-style: none; border: none; width: 200px; height: 193px;}
+td.whs15 {width: 28.501%; padding-right: 10px; padding-left: 10px; border-right-style: none; border-top-style: none; border-bottom-style: none;}
-img_whs16 {border-style: none; border: none; width: 150px; height: 129px;}
+p.whs16 {font-size: 12pt; margin-right: 0px;}
-img_whs17 {border-style: none; border: none; width: 200px; height: 211px;}
+img_whs17 {border-style: none; border: none; width: 150px; height: 250px;}
-p.whs18 {font-size: 12pt; margin-left: 40px; font-weight: bold;}
+td.whs18 {width: 31.796%; padding-right: 10px; padding-left: 10px; border-top-style: none; border-bottom-style: none; border-right-style: none;}
-img_whs19 {border-style: none; border: none; width: 150px; height: 154px;}
+img_whs19 {border-style: none; border: none; width: 170px; height: 250px;}
-img_whs20 {border-style: none; border: none; width: 200px; height: 202px;}
+p.whs20 {font-size: 12pt; margin-left: 40px;}
-img_whs21 {border-style: none; border: none; width: 150px; height: 123px;}
+p.whs21 {color: #808080; font-size: 12pt;}
-p.whs22 {font-size: 14pt;}
+p.whs22 {font-size: 12pt; color: #000000;}
-img_whs23 {border-style: none; border: none; width: 20px; height: 20px;}
+p.whs23 {color: #808080; font-size: 12pt; margin-left: 40px;}
-img_whs24 {border-style: none; border: none; width: 200px; height: 194px;}
+img_whs24 {border-style: none; border: none; width: 150px; height: 140px;}
-p.whs25 {font-size: 12pt; font-weight: bold;}
+img_whs25 {border-style: none; border: none; width: 200px; height: 176px;}
-p.whs26 {font-size: 12pt; font-weight: bold; font-style: italic; x-text-underline: off; /*begin!kadov{{*/ text-decoration: none; /*}}end!kadov*/ }
+img_whs26 {border-style: none; border: none; width: 150px; height: 139px;}
-img_whs27 {border-style: none; border: none; width: 200px; height: 181px; float: none;}
+table.whs27 {x-cell-content-align: top; border-spacing: 0; width: 65.278%; border-spacing: 0px;}
-img_whs28 {border-style: none; border: none; width: 175px; height: 181px;}
+col.whs28 {width: 50.213%;}
-img_whs29 {border-style: none; border: none; width: 203px; height: 181px;}
+col.whs29 {width: 49.787%;}
-img_whs30 {border-style: none; border: none; width: 200px; height: 175px;}
+td.whs30 {width: 50.213%; padding-right: 10px; padding-left: 10px; border-right-style: none; border-left-style: none; border-top-style: none; border-bottom-style: none;}
-img_whs31 {border-style: none; border: none; width: 150px; height: 128px;}
+img_whs31 {border-style: none; border: none; width: 212px; height: 250px;}
-img_whs32 {border-style: none; border: none; width: 200px; height: 192px;}
+td.whs32 {width: 49.787%; padding-right: 10px; padding-left: 10px; border-top-style: none; border-bottom-style: none; border-right-style: none;}
-p.whs33 {font-size: 12pt; font-weight: bold; color: #000000;}
+img_whs33 {border-style: none; border: none; width: 211px; height: 250px;}
-img_whs34 {border-style: none; border: none; width: 150px; height: 131px;}
+img_whs34 {border-style: none; border: none; width: 150px; height: 129px;}
-p.whs35 {margin-left: 40px; font-size: 12pt;}
+img_whs35 {border-style: none; border: none; width: 200px; height: 211px;}
-img_whs36 {border-style: none; border: none; width: 200px; height: 162px;}
+p.whs36 {font-size: 12pt; margin-left: 40px; font-weight: bold;}
-p.whs37 {font-size: 12pt; margin-left: 40px; font-weight: bold; text-indent: -40px;}
+img_whs37 {border-style: none; border: none; width: 150px; height: 154px;}
-img_whs38 {border-style: none; border: none; width: 16px; height: 16px;}
+img_whs38 {border-style: none; border: none; width: 200px; height: 202px;}
-p.whs39 {margin-left: 40px; font-weight: bold; text-indent: -40px; font-size: 14pt;}
+img_whs39 {border-style: none; border: none; width: 150px; height: 123px;}
-p.whs40 {font-weight: bold; text-indent: -40px; font-size: 14pt; margin-left: 80px;}
+p.whs40 {font-size: 14pt;}
-img_whs41 {border-style: none; border: none; width: 200px; height: 185px;}
+img_whs41 {border-style: none; border: none; width: 20px; height: 20px;}
-p.whs42 {font-weight: bold; margin-left: 80px; text-indent: -80px; font-size: 12pt;}
+img_whs42 {border-style: none; border: none; width: 200px; height: 194px;}
-p.whs43 {font-weight: bold; text-indent: -80px; font-size: 12pt; margin-left: 120px;}
+p.whs43 {font-size: 12pt; font-weight: bold;}
-img_whs44 {border-style: none; border: none; width: 200px; height: 219px;}
+p.whs44 {font-size: 12pt; font-weight: bold; font-style: italic; x-text-underline: off; /*begin!kadov{{*/ text-decoration: none; /*}}end!kadov*/ }
+img_whs45 {border-style: none; border: none; width: 200px; height: 181px; float: none;}
+img_whs46 {border-style: none; border: none; width: 175px; height: 181px;}
+img_whs47 {border-style: none; border: none; width: 203px; height: 181px;}
+img_whs48 {border-style: none; border: none; width: 200px; height: 175px;}
+img_whs49 {border-style: none; border: none; width: 150px; height: 128px;}
+table.whs50 {x-cell-content-align: top; border-spacing: 0; width: 94.306%; border-spacing: 0px;}
+col.whs51 {width: 32.254%;}
+col.whs52 {width: 32.547%;}
+col.whs53 {width: 35.199%;}
+td.whs54 {width: 32.254%; padding-right: 10px; padding-left: 10px; border-right-style: none; border-left-style: none; border-top-style: none; border-bottom-style: none;}
+img_whs55 {border-style: none; border: none; width: 196px; height: 250px;}
+td.whs56 {width: 32.547%; padding-right: 10px; padding-left: 10px; border-right-style: none; border-top-style: none; border-bottom-style: none;}
+img_whs57 {border-style: none; border: none; width: 195px; height: 250px;}
+td.whs58 {width: 35.199%; padding-right: 10px; padding-left: 10px; border-top-style: none; border-bottom-style: none; border-right-style: none;}
+img_whs59 {border-style: none; border: none; width: 214px; height: 250px;}
+p.whs60 {font-size: 12pt; font-weight: bold; color: #000000;}
+img_whs61 {border-style: none; border: none; width: 150px; height: 131px;}
+table.whs62 {x-cell-content-align: top; width: 100%; border-spacing: 0;}
+td.whs63 {padding-right: 10px; padding-left: 10px; border-right-style: none; border-left-style: none; border-top-style: none; border-bottom-style: none;}
+img_whs64 {border: none; width: 234px; height: 200px;}
+td.whs65 {padding-right: 10px; padding-left: 10px; border-right-style: none; border-top-style: none; border-bottom-style: none;}
+img_whs66 {border: none; width: 235px; height: 200px;}
+td.whs67 {padding-right: 10px; padding-left: 10px; border-top-style: none; border-bottom-style: none; border-right-style: none;}
+img_whs68 {border-style: none; border: none; width: 221px; height: 200px;}
+p.whs69 {font-size: 12pt; margin-left: 0px;}
+p.whs70 {font-size: 12pt; margin-left: 40px; font-weight: bold; text-indent: -40px;}
+img_whs71 {border-style: none; border: none; width: 16px; height: 16px;}
+table.whs72 {x-cell-content-align: top; border-spacing: 0; width: 81.667%;}
+col.whs73 {width: 4.762%;}
+p.whs74 {font-weight: bold; font-size: 14pt;}
+img_whs75 {border: none; width: 272px; height: 250px;}
+img_whs76 {border: none; width: 242px; height: 250px;}
+p.whs77 {margin-left: 40px; font-weight: bold; text-indent: -40px; font-size: 14pt;}
+p.whs78 {font-weight: bold; text-indent: -40px; font-size: 14pt; margin-left: 40px;}
+img_whs79 {border: none; width: 257px; height: 250px;}
+p.whs80 {font-weight: bold; text-indent: -40px; font-size: 14pt; margin-left: 80px;}
+p.whs81 {font-weight: bold; margin-left: 80px; text-indent: -80px; font-size: 12pt;}
+p.whs82 {font-weight: bold; text-indent: -80px; font-size: 12pt; margin-left: 120px;}
+img_whs83 {border-style: none; border: none; width: 200px; height: 219px;}
 -->
 </style>
 <script type="text/javascript" language="JavaScript">
@@ -108,11 +147,14 @@ img_whs44 {border-style: none; border: none; width: 200px; height: 219px;}
 if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
 {
   var strNSS = "<style type='text/css'>";
-  strNSS += "p.whs37 {text-indent:1; }";
+  strNSS += "p.whs16 {margin-right:1; }";
-  strNSS += "p.whs39 {text-indent:1; }";
+  strNSS += "p.whs69 {margin-left:1; }";
-  strNSS += "p.whs40 {text-indent:1; }";
+  strNSS += "p.whs70 {text-indent:1; }";
-  strNSS += "p.whs42 {text-indent:1; }";
+  strNSS += "p.whs77 {text-indent:1; }";
-  strNSS += "p.whs43 {text-indent:1; }";
+  strNSS += "p.whs78 {text-indent:1; }";
+  strNSS += "p.whs80 {text-indent:1; }";
+  strNSS += "p.whs81 {text-indent:1; }";
+  strNSS += "p.whs82 {text-indent:1; }";
   strNSS +="</style>";
   document.write(strNSS);
 }
@@ -167,7 +209,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();
@@ -279,6 +321,10 @@ else
 	<li class=kadov-p><p class="whs4"><b style="font-weight: bold;">1st 
  Constructor:</b> 3 coordinates.</p></li>
 	
+	<li class=kadov-p><p class="whs4"><span style="font-weight: bold;"><B>2nd 
+ Constructor: </B></span><span>1 reference point + 3 coordinates defining the 
+ position of this point regarding the reference one</span></p></li>
+	
 	<li class=kadov-p><p class="whs4"><b style="font-weight: bold;">2nd 
  Constructor:</b> 1 edge &nbsp;+ 
  1 Parameter defining the position of the point on the given edge.</p></li>
@@ -290,17 +336,36 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs8"><img src="../image63.jpg" width="200px" height="176px" border="0" class="img_whs9"> &nbsp;<img src="../image65.jpg" width="200px" height="176px" border="0" class="img_whs9"></p>
+<!--(Table)=========================================================-->
+<table x-use-null-cells cellspacing="0" width="84.306%" class="whs8">
+<col class="whs9">
+<col class="whs10">
+<col class="whs11">
 
-<p class="whs10">&nbsp;</p>
+<tr valign="top" class="whs12">
+<td width="33.333%" class="whs13">
+<p class="whs4"><img src="../image207.jpg" width="218px" height="250px" border="0" class="img_whs14"></td>
+<td width="28.501%" class="whs15">
+<p class="whs16"><img src="../image208.jpg" width="150px" height="250px" border="0" class="img_whs17"></td>
+<td width="31.796%" class="whs18">
+<p class="whs4"><img src="../image209.jpg" width="170px" height="250px" border="0" class="img_whs19"></td></tr>
+</table>
 
-<p class="whs11"><b style="font-weight: bold;">Example:</b></p>
+<p class="whs4">&nbsp;</p>
 
-<p class="whs10">&nbsp;</p>
+<p class="whs4">&nbsp;</p>
 
-<p class="whs12"><img src="../image16.gif" width="150px" height="140px" border="0" class="img_whs13"></p>
+<p class="whs20">&nbsp;&nbsp;&nbsp;</p>
 
-<p class="whs12">&nbsp;</p>
+<p class="whs21">&nbsp;</p>
+
+<p class="whs22"><b style="font-weight: bold;">Example:</b></p>
+
+<p class="whs21">&nbsp;</p>
+
+<p class="whs23"><img src="../image16.gif" width="150px" height="140px" border="0" class="img_whs24"></p>
+
+<p class="whs23">&nbsp;</p>
 
 <p class="whs4">&nbsp;</p>
 
@@ -335,15 +400,15 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs8"><img src="../image66.jpg" width="200px" height="176px" border="0" class="img_whs9"></p>
+<p class="whs20"><img src="../image66.jpg" width="200px" height="176px" border="0" class="img_whs25"></p>
 
-<p class="whs10">&nbsp;</p>
+<p class="whs21">&nbsp;</p>
 
-<p class="whs11"><b style="font-weight: bold;">Example:</b></p>
+<p class="whs22"><b style="font-weight: bold;">Example:</b></p>
 
-<p class="whs10">&nbsp;</p>
+<p class="whs21">&nbsp;</p>
 
-<p class="whs12"><img src="../image67.jpg" width="150px" height="139px" border="0" class="img_whs14"></p>
+<p class="whs23"><img src="../image67.jpg" width="150px" height="139px" border="0" class="img_whs26"></p>
 
 <p class="whs4">&nbsp;</p>
 
@@ -372,7 +437,21 @@ else
 <p class="whs4">&nbsp;</p>
 
 <p class="whs4"><b style="font-weight: bold;">Arguments:</b> 
- 1 vertex (for the center) + 1 edge (for the direction) + Radius.</p>
+ </p>
+
+<ul>
+	
+	<li class=kadov-p><p class="whs4"><b style="font-weight: bold;">1st 
+ Constructor:</b> 1 vertex (for the center) + 1 edge (for the direction) 
+ + Radius.</p></li>
+	
+	<li class=kadov-p><p class="whs4"><span style="font-weight: bold;"><B>2nd 
+ Constructor: </B></span><span>3 points which will form the circle.</span></p></li>
+</ul>
+
+<p class="whs4">&nbsp;</p>
+
+<p class="whs4">&nbsp;</p>
 
 <p class="whs4">&nbsp;</p>
 
@@ -380,15 +459,31 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs8"><img src="../image68.jpg" width="200px" height="193px" border="0" class="img_whs15"></p>
+<!--(Table)=========================================================-->
+<table x-use-null-cells cellspacing="0" width="65.278%" class="whs27">
+<col class="whs28">
+<col class="whs29">
 
-<p class="whs8">&nbsp;</p>
+<tr valign="top" class="whs12">
+<td width="50.213%" class="whs30">
+<p class="whs4"><img src="../image210.jpg" width="212px" height="250px" border="0" class="img_whs31"></td>
+<td width="49.787%" class="whs32">
+<p class="whs4"><img src="../image211.jpg" width="211px" height="250px" border="0" class="img_whs33"></td></tr>
+</table>
 
-<p class="whs11"><b style="font-weight: bold;">Example:</b></p>
+<p class="whs4">&nbsp;</p>
 
-<p class="whs10">&nbsp;</p>
+<p class="whs4">&nbsp;</p>
 
-<p class="whs12"><img src="../image17.gif" width="150px" height="129px" border="0" class="img_whs16"></p>
+<p class="whs20">&nbsp;</p>
+
+<p class="whs20">&nbsp;</p>
+
+<p class="whs22"><b style="font-weight: bold;">Example:</b></p>
+
+<p class="whs21">&nbsp;</p>
+
+<p class="whs23"><img src="../image17.gif" width="150px" height="129px" border="0" class="img_whs34"></p>
 
 <p class="whs4">&nbsp;</p>
 
@@ -425,15 +520,15 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs8"><img src="../image69.jpg" width="200px" height="211px" border="0" class="img_whs17"></p>
+<p class="whs20"><img src="../image69.jpg" width="200px" height="211px" border="0" class="img_whs35"></p>
 
-<p class="whs18">&nbsp;</p>
+<p class="whs36">&nbsp;</p>
 
-<p class="whs11"><b style="font-weight: bold;">Example:</b></p>
+<p class="whs22"><b style="font-weight: bold;">Example:</b></p>
 
-<p class="whs10">&nbsp;</p>
+<p class="whs21">&nbsp;</p>
 
-<p class="whs12"><img src="../image19.gif" width="150px" height="154px" border="0" class="img_whs19"></p>
+<p class="whs23"><img src="../image19.gif" width="150px" height="154px" border="0" class="img_whs37"></p>
 
 <p class="whs4">&nbsp;</p>
 
@@ -470,21 +565,21 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs8"><img src="../image70.jpg" width="200px" height="202px" border="0" class="img_whs20"></p>
+<p class="whs20"><img src="../image70.jpg" width="200px" height="202px" border="0" class="img_whs38"></p>
 
-<p class="whs10">&nbsp;</p>
+<p class="whs21">&nbsp;</p>
 
-<p class="whs11"><b style="font-weight: bold;">Example:</b></p>
+<p class="whs22"><b style="font-weight: bold;">Example:</b></p>
 
-<p class="whs10">&nbsp;</p>
+<p class="whs21">&nbsp;</p>
 
-<p class="whs12"><img src="../image20.gif" width="150px" height="123px" border="0" class="img_whs21"></p>
+<p class="whs23"><img src="../image20.gif" width="150px" height="123px" border="0" class="img_whs39"></p>
 
-<p class="whs12">&nbsp;</p>
+<p class="whs23">&nbsp;</p>
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs22"><b style="font-weight: bold;"><a NAME=_Toc57604488><img src="../image32.gif" width="20px" height="20px" border="0" class="img_whs23"> Curve</a></b></p>
+<p class="whs40"><b style="font-weight: bold;"><a NAME=_Toc57604488><img src="../image32.gif" width="20px" height="20px" border="0" class="img_whs41"> Curve</a></b></p>
 
 <p class="whs4">&nbsp;</p>
 
@@ -524,21 +619,21 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs8"><img src="../image144.jpg" width="200px" height="194px" border="0" class="img_whs24"></p>
+<p class="whs20"><img src="../image144.jpg" width="200px" height="194px" border="0" class="img_whs42"></p>
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs25">Example:</p>
+<p class="whs43">Example:</p>
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs26">Polyline 
+<p class="whs44">Polyline 
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Bezier 
  &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;B-Spline</p>
 
-<p class="whs4"><img src="../image147.jpg" x-maintain-ratio="TRUE" width="200px" height="181px" border="0" class="img_whs27"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="../image149.jpg" width="175px" height="181px" border="0" class="img_whs28"> &nbsp;&nbsp;&nbsp;&nbsp;<img src="../image150.jpg" width="203px" height="181px" border="0" class="img_whs29"></p>
+<p class="whs4"><img src="../image147.jpg" x-maintain-ratio="TRUE" width="200px" height="181px" border="0" class="img_whs45"> &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<img src="../image149.jpg" width="175px" height="181px" border="0" class="img_whs46"> &nbsp;&nbsp;&nbsp;&nbsp;<img src="../image150.jpg" width="203px" height="181px" border="0" class="img_whs47"></p>
 
-<p class="whs8">&nbsp;</p>
+<p class="whs20">&nbsp;</p>
 
 <p class="whs4">&nbsp;</p>
 
@@ -582,15 +677,15 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs8"><img src="../image71.jpg" width="200px" height="175px" border="0" class="img_whs30"> &nbsp;&nbsp;&nbsp;<img src="../image72.jpg" width="200px" height="175px" border="0" class="img_whs30"></p>
+<p class="whs20"><img src="../image71.jpg" width="200px" height="175px" border="0" class="img_whs48"> &nbsp;&nbsp;&nbsp;<img src="../image72.jpg" width="200px" height="175px" border="0" class="img_whs48"></p>
 
-<p class="whs8">&nbsp;</p>
+<p class="whs20">&nbsp;</p>
 
-<p class="whs11"><b style="font-weight: bold;">Example:</b></p>
+<p class="whs22"><b style="font-weight: bold;">Example:</b></p>
 
-<p class="whs10">&nbsp;</p>
+<p class="whs21">&nbsp;</p>
 
-<p class="whs12"><img src="../image21.gif" width="150px" height="128px" border="0" class="img_whs31"></p>
+<p class="whs23"><img src="../image21.gif" width="150px" height="128px" border="0" class="img_whs49"></p>
 
 <p class="whs4">&nbsp;</p>
 
@@ -622,15 +717,15 @@ else
 <ul>
 	
 	<li class=kadov-p><p class="whs4"><b style="font-weight: bold;">1st 
- Constructor :</b> 1 vertex + 1 edge &nbsp;+ 
+ Constructor :</b> 1 vertex + 1 vector &nbsp;+ 
  1 value (to define the size of the plane).</p></li>
 	
 	<li class=kadov-p><p class="whs4"><b style="font-weight: bold;">2nd 
- Constructor :</b> 1 vertex + 3 values (for the direction) + 1 value (to 
+ Constructor :</b> 1 vertex + 3 points (for the direction) + 1 value (to 
  define the size of the plane).</p></li>
 	
 	<li class=kadov-p><p class="whs4"><b style="font-weight: bold;">3rd 
- Constructor :</b> 1 face + 1 value (to define the size of the plane).</p></li>
+ Constructor :</b> 1 selection + 1 value (to define the size of the plane).</p></li>
 </ul>
 
 <p class="whs4">&nbsp;</p>
@@ -639,15 +734,34 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs4">&nbsp; <img src="../image73.jpg" width="200px" height="192px" border="0" class="img_whs32"> &nbsp;<img src="../image74.jpg" width="200px" height="192px" border="0" class="img_whs32"> &nbsp;<img src="../image75.jpg" width="200px" height="192px" border="0" class="img_whs32"> &nbsp;</p>
+<!--(Table)=========================================================-->
+<table x-use-null-cells cellspacing="0" width="94.306%" class="whs50">
+<col class="whs51">
+<col class="whs52">
+<col class="whs53">
+
+<tr valign="top" class="whs12">
+<td width="32.254%" class="whs54">
+<p class="whs4"><img src="../image212.jpg" width="196px" height="250px" border="0" class="img_whs55"></td>
+<td width="32.547%" class="whs56">
+<p class="whs4"><img src="../image213.jpg" width="195px" height="250px" border="0" class="img_whs57"></td>
+<td width="35.199%" class="whs58">
+<p class="whs4"><img src="../image214.jpg" width="214px" height="250px" border="0" class="img_whs59"></td></tr>
+</table>
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs33"><b><span style="font-weight: bold;"><B>Example:</B></span></b></p>
+<p class="whs4">&nbsp;</p>
 
-<p class="whs10">&nbsp;</p>
+<p class="whs4">&nbsp; &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>
 
-<p class="whs12"><img src="../image76.jpg" width="150px" height="131px" border="0" class="img_whs34"></p>
+<p class="whs4">&nbsp;</p>
+
+<p class="whs60"><b><span style="font-weight: bold;"><B>Example:</B></span></b></p>
+
+<p class="whs21">&nbsp;</p>
+
+<p class="whs23"><img src="../image76.jpg" width="150px" height="131px" border="0" class="img_whs61"></p>
 
 <p class="whs4">&nbsp;</p>
 
@@ -669,7 +783,8 @@ else
 
 <ul type="disc" class="whs3">
 	
-	<li class=kadov-p><p class="whs4">1 face, or</p></li>
+	<li class=kadov-p><p class="whs4">1 selection (face or 
+ planar face), or</p></li>
 	
 	<li class=kadov-p><p class="whs4">2 vectors, or</p></li>
 	
@@ -680,23 +795,40 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs4"><b style="font-weight: bold;">Dialog Box:</b></p>
+<p class="whs4"><b>Dialog Box:</b></p>
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs35"><img src="../image175.jpg" width="200px" height="162px" border="0" class="img_whs36"></p>
+<!--(Table)=========================================================-->
+<table x-use-null-cells cellspacing="0" width="100%" class="whs62">
+<col class="whs9">
+<col class="whs9">
+<col class="whs9">
 
-<p class="whs8">&nbsp;</p>
+<tr valign=top>
+<td width="33.333%" class="whs63">
+<p class="whs4"><img src="../image216.jpg" width="234px" height="200px" border="0" class="img_whs64"></td>
+<td width="33.333%" class="whs65">
+<p class="whs4"><img src="../image217.jpg" width="235px" height="200px" border="0" class="img_whs66"></td>
+<td width="33.333%" class="whs67">
+<p class="whs4"><img src="../image215.jpg" width="221px" height="200px" border="0" class="img_whs68"></td></tr>
+</table>
 
-<p class="whs18">&nbsp;</p>
+<p class="whs4">&nbsp;</p>
 
-<p class="whs37">&nbsp;</p>
+<p class="whs69">&nbsp;</p>
 
-<p class="whs37"><a name=_Toc57604489><img src="../image35.gif" width="16px" height="16px" border="0" class="img_whs38"><span 
+<p class="whs20">&nbsp;</p>
+
+<p class="whs36">&nbsp;</p>
+
+<p class="whs70">&nbsp;</p>
+
+<p class="whs70"><a name=_Toc57604489><img src="../image35.gif" width="16px" height="16px" border="0" class="img_whs71"><span 
  style="font-size: 14pt;"> <font size=4 style="font-size:14pt;"></font></span><b><span style="font-size: 14pt;"><font size=4 style="font-size:14pt;">Local 
  coordinate system</font></span></b></a></p>
 
-<p class="whs37">&nbsp;</p>
+<p class="whs70">&nbsp;</p>
 
 <p class="whs4"><b style="font-weight: bold;">Description:</b> 
  &nbsp;The user 
@@ -730,30 +862,57 @@ else
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs4"><b style="font-weight: bold;">Arguments:</b> 
+<p class="whs4"><b>Arguments:</b> </p>
- </p>
 
-<p class="whs4">Coordinates of origin</p>
+<ul>
-
+	
-<p class="whs4">X axis direction</p>
+	<li class=kadov-p><p class="whs4"><b>1st Constructor :</b> 
-
+ Coordinates of origin, <span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">X axis direction, 
-<p class="whs4"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;">Y axis direction</font></span>.</p>
+ Y axis direction</font></span></p></li>
+	
+	<li class=kadov-p><p class="whs4"><b>2nd Constructor :</b> 
+ reference object.</p></li>
+	
+	<li class=kadov-p><p class="whs4"><b>3rd Constructor :</b> 
+ 1 point of origin + X axis direction, Y axis direction.</p></li>
+</ul>
 
 <p class="whs4">&nbsp;</p>
 
-<p class="whs4"><b style="font-weight: bold;">Dialog Box:</b></p>
+<p class="whs4">.</p>
 
-<p class="whs39">&nbsp;</p>
+<p class="whs4">&nbsp;</p>
 
-<p class="whs40"><img src="../image146.jpg" width="200px" height="185px" border="0" class="img_whs41"></p>
+<p class="whs4"><b>Dialog Box:</b></p>
 
-<p class="whs40">&nbsp;</p>
+<p class="whs4">&nbsp;</p>
 
-<p class="whs42">Example:</p>
+<!--(Table)=========================================================-->
+<table x-use-null-cells width="81.667%" cellspacing="0" class="whs72">
+<col class="whs9">
+<col class="whs9">
+<col class="whs73">
 
-<p class="whs42">&nbsp;</p>
+<tr valign=top>
+<td width="33.333%" class="whs63">
+<p class="whs74"><img src="../image220.jpg" width="272px" height="250px" border="0" class="img_whs75"></td>
+<td width="33.333%" class="whs65">
+<p class="whs74"><img src="../image219.jpg" width="242px" height="250px" border="0" class="img_whs76"></td>
+<td width="4.762%" class="whs67">
+<p class="whs74">&nbsp;</td></tr>
+</table>
 
-<p class="whs43"><img src="../image145.jpg" width="200px" height="219px" border="0" class="img_whs44"></p>
+<p class="whs77">&nbsp;</p>
+
+<p class="whs78">&nbsp;<img src="../image218.jpg" width="257px" height="250px" border="0" class="img_whs79"></p>
+
+<p class="whs80">&nbsp;</p>
+
+<p class="whs81">Example:</p>
+
+<p class="whs81">&nbsp;</p>
+
+<p class="whs82"><img src="../image145.jpg" width="200px" height="219px" border="0" class="img_whs83"></p>
 
 <script type="text/javascript" language="javascript1.2">
 <!--

doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm

@@ -130,7 +130,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/salome2_sp3_buildgui_functions.htm

@@ -115,7 +115,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions.htm

@@ -101,7 +101,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions.htm

@@ -123,7 +123,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm

@@ -30,8 +30,8 @@
 <meta name=filetype content=kadov>
 <meta name=filetype-version content=1>
 <meta name=page-count content=1>
-<meta name=layout-height content=1054>
+<meta name=layout-height content=1096>
-<meta name=layout-width content=547>
+<meta name=layout-width content=532>
 
 
 <!--(Links)=========================================================-->
@@ -101,7 +101,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm

@@ -131,7 +131,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm

@@ -156,7 +156,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions.htm

@@ -112,7 +112,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions.htm

@@ -29,8 +29,8 @@
 <meta name=filetype content=kadov>
 <meta name=filetype-version content=1>
 <meta name=page-count content=1>
-<meta name=layout-height content=8452>
+<meta name=layout-height content=8252>
-<meta name=layout-width content=532>
+<meta name=layout-width content=766>
 
 
 <!--(Links)=========================================================-->
@@ -101,14 +101,20 @@ p.whs41 {margin-left: 80px; font-size: 12pt; text-indent: -40px;}
 img_whs42 {border-style: none; border: none; width: 200px; height: 231px;}
 img_whs43 {border-style: none; border: none; width: 185px; height: 231px;}
 p.whs44 {font-size: 12pt; text-indent: -68px; margin-left: 72px;}
-p.whs45 {font-size: 12pt; text-indent: -40px; margin-left: 80px;}
+p.whs45 {font-size: 12pt; text-indent: -68px; margin-left: 112px;}
-p.whs46 {font-size: 12pt; margin-left: 80px; text-indent: -80px;}
+img_whs46 {border-style: none; border: none; width: 200px; height: 216px;}
-p.whs47 {font-size: 12pt; margin-left: 80px; text-indent: -68px;}
+p.whs47 {font-size: 12pt; margin-left: 112px; text-indent: -112px;}
-img_whs48 {border-style: none; border: none; width: 200px; height: 180px;}
+p.whs48 {font-size: 12pt; text-indent: -112px; margin-left: 152px;}
-p.whs49 {font-size: 12pt; margin-left: 0px;}
+img_whs49 {border-style: none; border: none; width: 200px; height: 150px; float: none;}
-img_whs50 {border-style: none; border: none; width: 209px; height: 138px;}
+img_whs50 {border-style: none; border: none; width: 204px; height: 150px;}
-img_whs51 {border-style: none; border: none; width: 192px; height: 138px;}
+p.whs51 {font-size: 12pt; text-indent: -40px; margin-left: 80px;}
-img_whs52 {border-style: none; border: none; width: 191px; height: 138px;}
+p.whs52 {font-size: 12pt; margin-left: 80px; text-indent: -80px;}
+p.whs53 {font-size: 12pt; margin-left: 80px; text-indent: -68px;}
+img_whs54 {border-style: none; border: none; width: 200px; height: 180px;}
+p.whs55 {font-size: 12pt; margin-left: 0px;}
+img_whs56 {border-style: none; border: none; width: 209px; height: 138px;}
+img_whs57 {border-style: none; border: none; width: 192px; height: 138px;}
+img_whs58 {border-style: none; border: none; width: 191px; height: 138px;}
 -->
 </style>
 <script type="text/javascript" language="JavaScript">
@@ -121,9 +127,12 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
   strNSS += "p.whs41 {text-indent:1; }";
   strNSS += "p.whs44 {text-indent:1; }";
   strNSS += "p.whs45 {text-indent:1; }";
-  strNSS += "p.whs46 {text-indent:1; }";
   strNSS += "p.whs47 {text-indent:1; }";
-  strNSS += "p.whs49 {margin-left:1; }";
+  strNSS += "p.whs48 {text-indent:1; }";
+  strNSS += "p.whs51 {text-indent:1; }";
+  strNSS += "p.whs52 {text-indent:1; }";
+  strNSS += "p.whs53 {text-indent:1; }";
+  strNSS += "p.whs55 {margin-left:1; }";
   strNSS +="</style>";
   document.write(strNSS);
 }
@@ -178,7 +187,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();
@@ -219,6 +228,9 @@ else
 	<li class=kadov-p><p class="whs1"><a 
  HREF="#_Toc57113182">&nbsp;</a><a HREF="#sewing">Sewing</a></p></li>
 	
+	<li class=kadov-p><p class="whs1">&nbsp;<a 
+ href="#Glue_faces">Glue faces</a></p></li>
+	
 	<li class=kadov-p><p class="whs1"><a 
  HREF="#_Toc57113183">&nbsp;</a><a href="#AddPointOnEdge">Add 
  point on edge</a></p></li>
@@ -752,13 +764,65 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
 
 <p class="whs44">&nbsp;</p>
 
-<p class="whs45">&nbsp;</p>
+<p class="whs44">&nbsp;</p>
 
-<p class="whs46"><a name=CheckFreeBound><img src="../image44.gif" width="22px" height="22px" border="0" class="img_whs35"> <span 
+<p class="whs44">&nbsp;</p>
- style="font-size: 14pt; font-weight: bold;"><font size=4 style="font-size:14pt;"><B>Check free boundaries</B></font></span></a></p>
+
+<p class="whs44"><a name=Glue_faces><img src="../image61.gif" width="25px" height="24px" border="0" class="img_whs6"><span 
+ style="font-size: 14pt; font-weight: bold;"><font size=4 style="font-size:14pt;"><B> Glue faces</B></font></span></a></p>
+
+<p class="whs44">&nbsp;</p>
+
+<p class="whs44"><b style="font-weight: bold;">Description:</b> 
+ Glues faces that are coincident with respect to the given tolerance </p>
+
+<p class="whs44">value.</p>
+
+<p class="whs44">&nbsp;</p>
+
+<p class="whs44"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><b style="font-weight: bold;">Result:</b> 
+ GEOM_Object.</font></span></p>
+
+<p class="whs44">&nbsp;</p>
+
+<p class="whs44"><b style="font-weight: bold;">TUI Command 
+ : </b><span style="font-style: italic;"><I>geompy.MakeGlueFaces(theShape, 
+ theTolerance)</I></span>, where theShape is a compound of shapesto be glued, 
+ theTolerance is a maximum distance between two faces, which can be considered 
+ as coincident.</p>
+
+<p class="whs44"><i><span style="font-style: italic;"><I>&nbsp;</I></span></i></p>
+
+<p class="whs44"><b style="font-weight: bold;">Arguments: 
+ </b>1 <i><span style="font-style: normal;">Compound + Tolerance Value</span></i></p>
+
+<p class="whs44">&nbsp;</p>
+
+<p class="whs44"><b style="font-weight: bold;">Dialog Box:</b></p>
+
+<p class="whs44">&nbsp;</p>
+
+<p class="whs45"><img src="../image200.jpg" width="200px" height="216px" border="0" class="img_whs46"></p>
 
 <p class="whs47">&nbsp;</p>
 
+<p class="whs47"><b style="font-weight: bold;">Example:</b></p>
+
+<p class="whs47">&nbsp;</p>
+
+<p class="whs48"><img src="../image201.jpg" x-maintain-ratio="TRUE" width="200px" height="150px" border="0" class="img_whs49"> &nbsp;&nbsp;<img src="../image202.jpg" width="204px" height="150px" border="0" class="img_whs50"></p>
+
+<p class="whs51">&nbsp;</p>
+
+<p class="whs51">&nbsp;</p>
+
+<p class="whs51">&nbsp;</p>
+
+<p class="whs52"><a name=CheckFreeBound><img src="../image44.gif" width="22px" height="22px" border="0" class="img_whs35"> <span 
+ style="font-size: 14pt; font-weight: bold;"><font size=4 style="font-size:14pt;"><B>Check free boundaries</B></font></span></a></p>
+
+<p class="whs53">&nbsp;</p>
+
 <p class="whs4"><b style="font-weight: bold;">Description:</b> 
  Detects wires and edges that correspond to the shape's boundary, and highlights 
  it</p>
@@ -787,19 +851,19 @@ if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
 
 <p class="whs36">&nbsp;</p>
 
-<p class="whs15"><b style="font-weight: bold;"><img src="../image169.jpg" width="200px" height="180px" border="0" class="img_whs48"></b></p>
+<p class="whs15"><b style="font-weight: bold;"><img src="../image169.jpg" width="200px" height="180px" border="0" class="img_whs54"></b></p>
 
-<p class="whs49">&nbsp;</p>
+<p class="whs55">&nbsp;</p>
 
-<p class="whs49"><b style="font-weight: bold;">Example:</b></p>
+<p class="whs55"><b style="font-weight: bold;">Example:</b></p>
 
-<p class="whs49">&nbsp;</p>
+<p class="whs55">&nbsp;</p>
 
-<p class="whs49"><img src="../image170.jpg" width="209px" height="138px" border="0" class="img_whs50"> &nbsp;<img src="../image171.jpg" width="192px" height="138px" border="0" class="img_whs51">&nbsp; <img src="../image172.jpg" width="191px" height="138px" border="0" class="img_whs52"></p>
+<p class="whs55"><img src="../image170.jpg" width="209px" height="138px" border="0" class="img_whs56"> &nbsp;<img src="../image171.jpg" width="192px" height="138px" border="0" class="img_whs57">&nbsp; <img src="../image172.jpg" width="191px" height="138px" border="0" class="img_whs58"></p>
 
-<p class="whs49">&nbsp;</p>
+<p class="whs55">&nbsp;</p>
 
-<p class="whs49">&nbsp;</p>
+<p class="whs55">&nbsp;</p>
 
 <script type="text/javascript" language="javascript1.2">
 <!--

doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions.htm

@@ -29,8 +29,8 @@
 <meta name=filetype content=kadov>
 <meta name=filetype-version content=1>
 <meta name=page-count content=1>
-<meta name=layout-height content=6092>
+<meta name=layout-height content=7022>
-<meta name=layout-width content=517>
+<meta name=layout-width content=510>
 
 
 <!--(Links)=========================================================-->
@@ -73,19 +73,26 @@ p.whs9 {margin-left: 40px;}
 img_whs10 {border-style: none; border: none; width: 150px; height: 163px;}
 img_whs11 {border-style: none; border: none; width: 200px; height: 193px;}
 img_whs12 {border-style: none; border: none; width: 150px; height: 145px;}
-img_whs13 {border-style: none; border: none; width: 200px; height: 176px;}
+p.whs13 {margin-left: 48px; text-indent: -48px;}
-img_whs14 {border-style: none; border: none; width: 150px; height: 127px;}
+p.whs14 {margin-left: 48px; text-indent: -48px; font-size: 14pt; font-weight: bold;}
-p.whs15 {margin-left: 40px; font-size: 12pt;}
+img_whs15 {border-style: none; border: none; width: 25px; height: 22px;}
-img_whs16 {border-style: none; border: none; width: 150px; height: 153px;}
+img_whs16 {border-style: none; border: none; width: 209px; height: 234px;}
-p.whs17 {font-size: 12pt; margin-left: 40px; text-indent: -40px;}
+img_whs17 {border-style: none; border: none; width: 200px; height: 234px;}
-img_whs18 {border-style: none; border: none; width: 24px; height: 22px;}
+p.whs18 {font-size: 12pt; margin-left: 40px; text-indent: -40px;}
-img_whs19 {border-style: none; border: none; width: 200px; height: 164px;}
+p.whs19 {font-size: 12pt; text-indent: -40px; margin-left: 80px;}
-p.whs20 {font-size: 12pt; font-weight: bold;}
+img_whs20 {border-style: none; border: none; width: 200px; height: 209px;}
-img_whs21 {border-style: none; border: none; width: 200px; height: 191px;}
+img_whs21 {border-style: none; border: none; width: 200px; height: 176px;}
-img_whs22 {border-style: none; border: none; width: 200px; height: 227px;}
+img_whs22 {border-style: none; border: none; width: 150px; height: 127px;}
-img_whs23 {border-style: none; border: none; width: 150px; height: 123px;}
+p.whs23 {margin-left: 40px; font-size: 12pt;}
-img_whs24 {border-style: none; border: none; width: 150px; height: 128px;}
+img_whs24 {border-style: none; border: none; width: 150px; height: 153px;}
-img_whs25 {border-style: none; border: none; width: 150px; height: 113px;}
+img_whs25 {border-style: none; border: none; width: 24px; height: 22px;}
+img_whs26 {border-style: none; border: none; width: 200px; height: 164px;}
+p.whs27 {font-size: 12pt; font-weight: bold;}
+img_whs28 {border-style: none; border: none; width: 200px; height: 191px;}
+img_whs29 {border-style: none; border: none; width: 200px; height: 227px;}
+img_whs30 {border-style: none; border: none; width: 150px; height: 123px;}
+img_whs31 {border-style: none; border: none; width: 150px; height: 128px;}
+img_whs32 {border-style: none; border: none; width: 150px; height: 113px;}
 -->
 </style>
 <script type="text/javascript" language="JavaScript">
@@ -93,7 +100,10 @@ img_whs25 {border-style: none; border: none; width: 150px; height: 113px;}
 if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
 {
   var strNSS = "<style type='text/css'>";
-  strNSS += "p.whs17 {text-indent:1; }";
+  strNSS += "p.whs13 {text-indent:1; }";
+  strNSS += "p.whs14 {text-indent:1; }";
+  strNSS += "p.whs18 {text-indent:1; }";
+  strNSS += "p.whs19 {text-indent:1; }";
   strNSS +="</style>";
   document.write(strNSS);
 }
@@ -148,7 +158,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("../geom_help.html");
+	setRelStartPage("../geom.html");
 
 		autoSync(0);
 		sendSyncInfo();
@@ -173,7 +183,10 @@ else
  HREF="#_Toc57113210"><font><span style="font-family: 'Times New Roman', serif; font-size: 12pt;"><font size=3 style="font-size:12pt;">Translation&#9;</font></span></font></a></p></li>
 	
 	<li class=kadov-p><p class="whs4"><a 
- HREF="#_Toc57113211"><font><span style="font-family: 'Times New Roman', serif; font-size: 12pt;"><font size=3 style="font-size:12pt;">Rotation&#9;</font></span></font></a></p></li>
+ HREF="#_Toc57113211">Rotation</a></p></li>
+	
+	<li class=kadov-p><p class="whs4"><a 
+ href="#_Toc57113217">Modify the location</a><a HREF="#_Toc57113211">&#9;</a></p></li>
 	
 	<li class=kadov-p><p class="whs4"><a 
  HREF="#_Toc57113212"><span style="font-family: 'Times New Roman', serif; font-size: 12pt;"><font size=3 style="font-size:12pt;">Mirror 
@@ -190,8 +203,7 @@ else
  (Pattern)&#9;</font></span></a></p></li>
 	
 	<li class=kadov-p><p class="whs4"><a 
- HREF="#_Toc57113215"><span style="font-family: 'Times New Roman', serif; font-size: 12pt;"><font size=3 style="font-size:12pt;">Multi-Rotation 
+ HREF="#_Toc57113215">Multi-Rotation (Pattern)</a></p></li>
- (Pattern)&#9;</font></span></a></p></li>
 </ul>
 
 <p class="whs1">&nbsp;</p>
@@ -287,7 +299,53 @@ else
 
 <p class="whs9">&nbsp;</p>
 
-<p class="whs9">&nbsp;</p>
+<p class="whs13">&nbsp;</p>
+
+<p class="whs14"><a name=_Toc57113217
+									style="font-size: 14pt; font-weight: bold;"><img src="../image59.gif" width="25px" height="22px" border="0" class="img_whs15"> Modify the Location</a></p>
+
+<p class="whs13">&nbsp;</p>
+
+<p class="whs1"><span style="font-size: 12pt;"><font size=3 style="font-size:12pt;"><b style="font-weight: bold;">Description:</b> 
+ Modification of location of an object.</font></span></p>
+
+<p class="whs1">&nbsp;</p>
+
+<p class="whs1"><b style="font-weight: bold;">Result:</b> GEOM_Object.</p>
+
+<p class="whs1">&nbsp;</p>
+
+<p class="whs1"><b style="font-weight: bold;">TUI Command:</b><i> 
+ geompy.MakePosition(theObject, theStartLCS, theEndLCS), </i>where&nbsp;theObject 
+ is a shape, location of which is modified, theStartLCS is a location to 
+ move the shape from, theEndLCS is a location to move the shape to.</p>
+
+<p class="whs1">&nbsp;</p>
+
+<p class="whs1"><b style="font-weight: bold;">Arguments:</b> 
+ 1 GEOM_Object + [Starting Coordinate System] + End Coordinate System.</p>
+
+<p class="whs1">&nbsp;</p>
+
+<p class="whs1"><b style="font-weight: bold;">Dialog Box:</b></p>
+
+<p class="whs1">&nbsp;</p>
+
+<p class="whs7"><img src="../image199.jpg" width="209px" height="234px" border="0" class="img_whs16"> &nbsp;&nbsp;<img src="../image196.jpg" width="200px" height="234px" border="0" class="img_whs17"></p>
+
+<p class="whs18">&nbsp;</p>
+
+<p class="whs18"><b style="font-weight: bold;">Example:</b></p>
+
+<p class="whs18">&nbsp;</p>
+
+<p class="whs19"><img src="../image197.jpg" width="200px" height="209px" border="0" class="img_whs20"></p>
+
+<p class="whs18">&nbsp;</p>
+
+<p class="whs18">&nbsp;</p>
+
+<p class="whs18">&nbsp;</p>
 
 <p class="whs5"><a NAME=_Toc57113212><span 
  style="font-size: 14pt;"><font size=4 style="font-size:14pt;"><img src="salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image130.gif" width="20px" height="20px" border="0" class="img_whs6"><b style="font-size: 14pt;"> Mirror</b></a> 
@@ -320,7 +378,7 @@ else
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs7"><img src="../image120.jpg" width="200px" height="176px" border="0" class="img_whs13"></p>
+<p class="whs7"><img src="../image120.jpg" width="200px" height="176px" border="0" class="img_whs21"></p>
 
 <p class="whs1">&nbsp;</p>
 
@@ -328,7 +386,7 @@ else
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs7"><img src="../image121.jpg" width="150px" height="127px" border="0" class="img_whs14"> &nbsp;<img src="../image122.jpg" width="150px" height="127px" border="0" class="img_whs14"></p>
+<p class="whs7"><img src="../image121.jpg" width="150px" height="127px" border="0" class="img_whs22"> &nbsp;<img src="../image122.jpg" width="150px" height="127px" border="0" class="img_whs22"></p>
 
 <p class="whs7">&nbsp;</p>
 
@@ -372,14 +430,14 @@ else
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs15"><img src="../image23.gif" width="150px" height="153px" border="0" class="img_whs16"> &nbsp;<img src="../image124.jpg" width="150px" height="153px" border="0" class="img_whs16"></p>
+<p class="whs23"><img src="../image23.gif" width="150px" height="153px" border="0" class="img_whs24"> &nbsp;<img src="../image124.jpg" width="150px" height="153px" border="0" class="img_whs24"></p>
 
 <p class="whs7">&nbsp;</p>
 
-<p class="whs17"><a name=_Toc57113216><img src="../image37.gif" width="24px" height="22px" border="0" class="img_whs18"> <span 
+<p class="whs18"><a name=_Toc57113216><img src="../image37.gif" width="24px" height="22px" border="0" class="img_whs25"> <span 
  style="font-size: 14pt; font-weight: bold;"><font size=4 style="font-size:14pt;"><B>Offset surface</B></font></span></a></p>
 
-<p class="whs17">&nbsp;</p>
+<p class="whs18">&nbsp;</p>
 
 <p class="whs1"><b style="font-weight: bold;">Description:</b> 
  Each point is translated along a local normal by a given distance (signed 
@@ -416,13 +474,13 @@ else
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs7"><b style="font-weight: bold;"><img src="../image152.jpg" width="200px" height="164px" border="0" class="img_whs19"></b></p>
+<p class="whs7"><b style="font-weight: bold;"><img src="../image152.jpg" width="200px" height="164px" border="0" class="img_whs26"></b></p>
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs20">Example:</p>
+<p class="whs27">Example:</p>
 
-<p class="whs7"><img src="../image151.jpg" width="200px" height="191px" border="0" class="img_whs21"></p>
+<p class="whs7"><img src="../image151.jpg" width="200px" height="191px" border="0" class="img_whs28"></p>
 
 <p class="whs7">&nbsp;</p>
 
@@ -483,7 +541,7 @@ else
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs7"><img src="../image125.jpg" width="200px" height="227px" border="0" class="img_whs22"> &nbsp;<img src="../image126.jpg" width="200px" height="227px" border="0" class="img_whs22"></p>
+<p class="whs7"><img src="../image125.jpg" width="200px" height="227px" border="0" class="img_whs29"> &nbsp;<img src="../image126.jpg" width="200px" height="227px" border="0" class="img_whs29"></p>
 
 <p class="whs1">&nbsp;</p>
 
@@ -495,7 +553,7 @@ else
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs7"><img src="../image24.gif" width="150px" height="123px" border="0" class="img_whs23"> &nbsp;<img src="../image128.jpg" width="150px" height="123px" border="0" class="img_whs23"></p>
+<p class="whs7"><img src="../image24.gif" width="150px" height="123px" border="0" class="img_whs30"> &nbsp;<img src="../image128.jpg" width="150px" height="123px" border="0" class="img_whs30"></p>
 
 <p class="whs1">&nbsp;</p>
 
@@ -503,7 +561,7 @@ else
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs7"><img src="../image24.gif" width="150px" height="123px" border="0" class="img_whs23"> &nbsp;<img src="../image127.jpg" width="150px" height="123px" border="0" class="img_whs23"></p>
+<p class="whs7"><img src="../image24.gif" width="150px" height="123px" border="0" class="img_whs30"> &nbsp;<img src="../image127.jpg" width="150px" height="123px" border="0" class="img_whs30"></p>
 
 <p class="whs1">&nbsp;</p>
 
@@ -576,7 +634,7 @@ else
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs7"><img src="../image129.jpg" width="150px" height="128px" border="0" class="img_whs24"> &nbsp;<img src="../image130.jpg" width="150px" height="128px" border="0" class="img_whs24"></p>
+<p class="whs7"><img src="../image129.jpg" width="150px" height="128px" border="0" class="img_whs31"> &nbsp;<img src="../image130.jpg" width="150px" height="128px" border="0" class="img_whs31"></p>
 
 <p class="whs1">&nbsp;</p>
 
@@ -584,7 +642,7 @@ else
 
 <p class="whs1">&nbsp;</p>
 
-<p class="whs7"><img src="../image25.gif" width="150px" height="113px" border="0" class="img_whs25"> &nbsp;<img src="../image133.jpg" width="150px" height="113px" border="0" class="img_whs25"></p>
+<p class="whs7"><img src="../image25.gif" width="150px" height="113px" border="0" class="img_whs32"> &nbsp;<img src="../image133.jpg" width="150px" height="113px" border="0" class="img_whs32"></p>
 
 <p>&nbsp;</p>
 

doc/salome/gui/GEOM/newentity_blocks.htm

@@ -126,7 +126,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("geom_help.html");
+	setRelStartPage("geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

doc/salome/gui/GEOM/sketcher.htm

@@ -19,8 +19,8 @@
 <meta name=filetype content=kadov>
 <meta name=filetype-version content=1>
 <meta name=page-count content=1>
-<meta name=layout-height content=536>
+<meta name=layout-height content=1268>
-<meta name=layout-width content=491>
+<meta name=layout-width content=740>
 
 
 <!--(Links)=========================================================-->
@@ -36,8 +36,30 @@ if (navigator.appName !="Netscape")
 <!--
 img_whs1 {border-style: none; border: none; float: none; width: 30px; height: 30px;}
 p.whs2 {font-size: 12pt;}
+ul.whs3 {list-style: disc;}
+p.whs4 {margin-left: 40px; font-size: 12pt;}
+img_whs5 {border-style: none; border: none; width: 200px; height: 277px;}
+img_whs6 {border-style: none; border: none; width: 200px; height: 276px;}
+p.whs7 {font-size: 12pt; margin-left: 40px; text-indent: -40px;}
+p.whs8 {font-size: 12pt; margin-left: 40px; text-indent: -40px; font-weight: bold;}
+p.whs9 {font-size: 12pt; text-indent: -40px; font-weight: bold; margin-left: 80px;}
+img_whs10 {border-style: none; border: none; width: 200px; height: 200px;}
+img_whs11 {border-style: none; border: none; width: 200px; height: 195px;}
 -->
 </style>
+<script type="text/javascript" language="JavaScript">
+<!--
+if ((navigator.appName == "Netscape") && (parseInt(navigator.appVersion) == 4))
+{
+  var strNSS = "<style type='text/css'>";
+  strNSS += "p.whs7 {text-indent:1; }";
+  strNSS += "p.whs8 {text-indent:1; }";
+  strNSS += "p.whs9 {text-indent:1; }";
+  strNSS +="</style>";
+  document.write(strNSS);
+}
+//-->
+</script>
 <script type="text/javascript" language="JavaScript" title="WebHelpInlineScript">
 <!--
 function reDo() {
@@ -87,7 +109,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("geom_help.html");
+	setRelStartPage("geom.html");
 
 		autoSync(0);
 		sendSyncInfo();
@@ -135,12 +157,63 @@ else
 <p class="whs2">&nbsp;</p>
 
 <p class="whs2"><b style="font-weight: bold;">Arguments:</b> 
- 1 shape + 3 values (coordinates).</p>
+ </p>
+
+<p class="whs2"><span><font size=3 style="font-size:12pt;">1. Element type (segment or arc).</font></span></p>
+
+<p class="whs2">2. Destination type (point or direction).</p>
+
+<p class="whs2">3. <span>Destination point by means of:</span></p>
+
+<ul type="disc" class="whs3">
+	
+	<li class=kadov-p><p class="whs2">absolute coordinates 
+ X,Y;</p></li>
+	
+	<li class=kadov-p><p class="whs2">relative coordinates 
+ DX, DY (with respect to the current point);</p></li>
+	
+	<li class=kadov-p><p class="whs2">selection of an existing 
+ point.</p></li>
+</ul>
+
+<p class="whs2">4. Destination direction by means of:</p>
+
+<ul type="disc" class="whs3">
+	
+	<li class=kadov-p><p class="whs2">angle between the new 
+ segment and the previous one;</p></li>
+	
+	<li class=kadov-p><p class="whs2">perpendicular to the 
+ previous segment (same as previous, but angle is predefined and is equal 
+ to 90 degrees);</p></li>
+	
+	<li class=kadov-p><p class="whs2">tangent to the previous 
+ segment;</p></li>
+	
+	<li class=kadov-p><p class="whs2">vector components VX, 
+ DY.</p></li>
+</ul>
+
+<p class="whs2">5. Parameters of an element (for segment : 
+ length or target X or Y coordinate value, for arc : radius and angle).</p>
 
 <p class="whs2">&nbsp;</p>
 
 <p class="whs2"><b style="font-weight: bold;">Dialog Box:</b></p>
 
+<p class="whs2">&nbsp;</p>
+
+<p class="whs4"><img src="image203.jpg" width="200px" height="277px" border="0" class="img_whs5"> &nbsp;&nbsp;<img src="image205.jpg" width="200px" height="276px" border="0" class="img_whs6"></p>
+
+<p class="whs7">&nbsp;</p>
+
+<p class="whs8">Example:</p>
+
+<p class="whs9">&nbsp;</p>
+
+<p class="whs9"><img src="image204.jpg" width="200px" height="200px" border="0" class="img_whs10"> &nbsp;&nbsp;<img src="image206.jpg" width="200px" height="195px" border="0" class="img_whs11"></p>
+
 <script type="text/javascript" language="javascript1.2">
 <!--
 if (window.writeIntopicBar)

doc/salome/gui/GEOM/whdata/whfwdata0.htm

@@ -13,23 +13,25 @@
 aWE("«apply»",3);
 aWE("«ok»",3);
 aWE("0",1,12);
-aWE("1",1,15,3,4,7,5,11,12,13,10,9,16);
+aWE("1",1,15,11,12,7,9,10,5,13,4,3,16);
-aWE("1d",3,10);
+aWE("1d",10,3);
-aWE("1st",3,11,12,13,10);
+aWE("1st",11,12,10,13,3);
-aWE("2",14,1,15,3,4,5,11,12,13,10,9);
+aWE("2",14,1,15,11,12,9,10,5,13,4,3);
-aWE("2d",3,4,7,5,12,10);
+aWE("2d",12,7,10,5,4,3);
-aWE("2nd",3,11,12,13,10);
+aWE("2nd",11,12,10,13,3);
-aWE("3",15,3,4,11,12,13,10);
+aWE("3",15,11,12,10,13,4,3);
-aWE("3d",3,4,6,7,5,11,12,10,9);
+aWE("3d",11,12,7,9,10,6,5,4,3);
-aWE("3rd",3,10);
+aWE("3rd",10,3);
-aWE("4",14,4,12,10);
+aWE("4",14,15,12,10,4);
-aWE("5",7,12);
+aWE("5",15,12,7);
 aWE("6",14,12);
 aWE("7",12);
 aWE("8",12);
 aWE("9",15,12);
+aWE("90",15);
 aWE("abl",15);
-aWE("accord",3,12);
+aWE("absolut",15);
+aWE("accord",12,3);
 aWE("accordanc",12);
 aWE("achiev",12);
 aWE("ad",12,16);
@@ -40,8 +42,8 @@ aWE("advanc",7,5);
 aWE("aim",10);
 aWE("algorithm",10);
 aWE("allow",14,15,8,13,16);
-aWE("along",7,13,10);
+aWE("along",7,10,13);
-aWE("angl",15,7,12,13);
+aWE("angl",15,12,7,13);
 aWE("anoth",4);
 aWE("any",12);
 aWE("ap",12);
@@ -51,75 +53,76 @@ aWE("apply",12);
 aWE("approximation",12);
 aWE("arc",15,3);
 aWE("archimed",10);
-aWE("argument",14,1,15,3,4,7,5,11,12,13,10,9,16);
+aWE("argument",14,1,15,11,12,7,9,10,5,13,4,3,16);
 aWE("around",7);
 aWE("associat",6);
 aWE("attribut",6);
 aWE("automatical",14,3);
 aWE("availabl",6);
 aWE("ax",3);
-aWE("axi",3,7,11,13,9);
+aWE("axi",11,7,9,13,3);
 aWE("b",3);
 aWE("back",12);
-aWE("bas",7,11,12,13);
+aWE("bas",11,12,7,13);
 aWE("baseshap",7);
 aWE("basi",7);
-aWE("basic",2,15,3,5,10,9);
+aWE("basic",2,15,9,10,5,3);
 aWE("basicproperti",9);
 aWE("befor",15,12);
 aWE("below",14);
-aWE("bezi",3,12);
+aWE("bezi",12,3);
 aWE("block",14,0,10);
-aWE("boolean",2,4,5,9);
+aWE("boolean",2,9,5,4);
 aWE("both",6);
 aWE("bound",9);
 aWE("boundari",12);
 aWE("boundary",12);
 aWE("boundingbox",9);
-aWE("box",14,1,15,3,4,8,7,5,11,12,13,10,9,16);
+aWE("box",14,1,15,8,11,12,7,9,10,5,13,4,3,16);
 aWE("brep",2,8);
-aWE("brows",3,6,8);
+aWE("brows",8,6,3);
 aWE("bsplin",12);
 aWE("bsplinerestriction",12);
-aWE("build",14,0,2,5,10);
+aWE("build",14,0,2,10,5);
 aWE("button",3);
 aWE("bypas",14);
 aWE("cad",2);
 aWE("camera",3);
-aWE("cas",14,3,12);
+aWE("cas",14,12,3);
-aWE("cent",15,3,11,13,9);
+aWE("cent",15,11,9,13,3);
 aWE("centerofscal",13);
 aWE("central",11);
 aWE("chamf",10);
 aWE("chang",1);
-aWE("check",12,10,9);
+aWE("check",12,9,10);
 aWE("checkshap",9);
-aWE("choos",6,8,10);
+aWE("choos",8,10,6);
 aWE("circl",3);
-aWE("click",1,6,8);
+aWE("click",1,8,6);
-aWE("clos",5,12);
+aWE("clos",12,5);
 aWE("closecontour",12);
 aWE("closedwir",12);
 aWE("closur",12);
+aWE("coincident",12);
 aWE("color",1);
-aWE("command",14,1,15,3,4,6,8,7,5,11,12,13,10,9,16);
+aWE("command",14,1,15,8,11,12,7,9,10,6,5,13,4,3,16);
-aWE("common",4,12);
+aWE("common",12,4);
-aWE("complex",2,4,7,10);
+aWE("complex",2,7,10,4);
-aWE("component",3,13);
+aWE("component",15,13,3);
 aWE("compos",14,9);
-aWE("compound",14,4,5,13,10);
+aWE("compound",14,12,10,5,13,4);
 aWE("compsolid",7);
-aWE("comput",10,9);
+aWE("comput",9,10);
 aWE("con",11);
 aWE("concern",9);
 aWE("confirm",8);
 aWE("conical",12);
-aWE("connect",5,10);
+aWE("connect",10,5);
 aWE("consider",12);
 aWE("constraint",14);
-aWE("construct",14,5,11);
+aWE("construct",14,11,5);
 aWE("construction",2,4);
-aWE("constructor",3,11,12,13,10);
+aWE("constructor",11,12,10,13,3);
 aWE("contain",15,8,12);
 aWE("content",8);
 aWE("context",12);
@@ -129,51 +132,51 @@ aWE("continuity2d",12);
 aWE("continuity3d",12);
 aWE("contour",12);
 aWE("conversion",12);
-aWE("coordinat",15,3,11,13,9);
+aWE("coordinat",15,11,9,13,3);
 aWE("copy",13);
 aWE("corner",11);
 aWE("correction",12);
-aWE("correspond",3,7,5,11,12,10);
+aWE("correspond",11,12,7,10,5,3);
 aWE("coupl",15);
-aWE("creat",14,15,3,6,7,5,11,12,13,10,9,16);
+aWE("creat",14,15,11,12,7,9,10,6,5,13,3,16);
 aWE("creategroup",16);
-aWE("creation",2,7,12,10);
+aWE("creation",2,12,7,10);
 aWE("current",15,6);
-aWE("curv",15,3,7,12);
+aWE("curv",15,12,7,3);
 aWE("curve2dmod",12);
 aWE("curve3dmod",12);
 aWE("curvecontinuity",12);
-aWE("cut",4,12);
+aWE("cut",12,4);
 aWE("cylind",11);
 aWE("cylindrical",12);
 aWE("d1",10);
 aWE("d2",10);
 aWE("data",9);
 aWE("default",15);
-aWE("defin",15,3,11,12,10);
+aWE("defin",15,11,12,10,3);
 aWE("definit",9);
-aWE("definition",7,12);
+aWE("definition",12,7);
 aWE("deflection",10);
-aWE("degre",7,12);
+aWE("degre",15,12,7);
 aWE("delet",10);
 aWE("density",10);
 aWE("depend",10);
 aWE("describ",8);
-aWE("description",14,1,15,3,4,6,7,5,11,12,13,10,9,16);
+aWE("description",14,1,15,11,12,7,9,10,6,5,13,4,3,16);
 aWE("desir",12);
 aWE("destin",2);
 aWE("destination",15);
 aWE("detect",12);
 aWE("detection",12);
 aWE("diagonal",11);
-aWE("dialog",14,1,15,3,4,8,7,5,11,12,13,10,9,16);
+aWE("dialog",14,1,15,8,11,12,7,9,10,5,13,4,3,16);
 aWE("dif",6);
-aWE("different",1,6,11,9);
+aWE("different",1,11,9,6);
-aWE("dimension",7,11,10,9);
+aWE("dimension",11,7,9,10);
 aWE("dir",13);
 aWE("dir1",13);
 aWE("dir2",13);
-aWE("direction",15,3,7,11,13,10);
+aWE("direction",15,11,7,10,13,3);
 aWE("dirface1v",10);
 aWE("dirfaceid1",10);
 aWE("dirfaceid1u",10);
@@ -181,45 +184,46 @@ aWE("dirfaceid1v",10);
 aWE("dirfaceid2",10);
 aWE("dirfaceid2u",10);
 aWE("dirfaceid2v",10);
-aWE("display",1,3,6,8,9);
+aWE("display",1,8,9,6,3);
 aWE("displayall",6);
 aWE("displayon",6);
-aWE("distanc",13,9);
+aWE("distanc",12,9,13);
 aWE("divid",12);
 aWE("divideedg",12);
 aWE("don",12,13);
 aWE("doubl",1,15);
 aWE("dropsmalledg",12);
-aWE("dx",13);
+aWE("dx",15,13);
-aWE("dy",13);
+aWE("dy",15,13);
 aWE("dz",13);
 aWE("e",6);
 aWE("e1",14);
 aWE("e2",14);
 aWE("e3",14);
 aWE("e4",14);
-aWE("edg",14,3,7,5,11,12,13,10);
+aWE("edg",14,11,12,7,10,5,13,3);
 aWE("edgeid",12);
 aWE("edit",16);
 aWE("egdemaxtol",9);
 aWE("egdemintol",9);
 aWE("eith",14);
-aWE("element",3,4,6,7,5,11,12,9);
+aWE("element",15,11,12,7,9,6,5,4,3);
 aWE("elementary",14);
 aWE("ellips",3);
 aWE("empty",12);
-aWE("end",15,3,12);
+aWE("end",15,12,13,3);
-aWE("ent",3,8);
+aWE("ent",8,3);
-aWE("entity",15,3,7,5,11,16);
+aWE("entity",15,11,7,5,3,16);
+aWE("equal",15);
 aWE("eras",6);
 aWE("eraseall",6);
 aWE("eraseon",6);
 aWE("error",12);
-aWE("etc",5,12);
+aWE("etc",12,5);
-aWE("exampl",14,1,3,4,7,5,11,12,13,10,16);
+aWE("exampl",14,1,15,11,12,7,10,5,13,4,3,16);
 aWE("except",12);
-aWE("exist",16);
+aWE("exist",15,16);
-aWE("explod",0,5,10);
+aWE("explod",0,10,5);
 aWE("export",2,8);
 aWE("exportation",8);
 aWE("extract",10);
@@ -231,7 +235,7 @@ aWE("f3",14);
 aWE("f4",14);
 aWE("f5",14);
 aWE("f6",14);
-aWE("fac",14,3,7,5,12,13,10);
+aWE("fac",14,12,7,10,5,13,3);
 aWE("face1",10);
 aWE("face2",10);
 aWE("facemaxtol",9);
@@ -239,15 +243,15 @@ aWE("facemintol",9);
 aWE("factor",13);
 aWE("fals",12);
 aWE("field",3);
-aWE("fil",3,8,7);
+aWE("fil",8,7,3);
 aWE("filenam",8);
 aWE("fill",7);
 aWE("fillet",10);
-aWE("first",3,4,5,11,13,10);
+aWE("first",11,10,5,13,4,3);
 aWE("fix",12);
 aWE("fixfacesiz",12);
 aWE("fixshap",12);
-aWE("follow",14,4,6,5);
+aWE("follow",14,6,5,4);
 aWE("format",2,8);
 aWE("formatnam",8);
 aWE("four",14);
@@ -258,27 +262,27 @@ aWE("gap",12);
 aWE("general",14);
 aWE("generat",7);
 aWE("generation",2,7);
-aWE("geom",1,2,3,4,6,8,7,5,11,13,10,9);
+aWE("geom",1,2,8,11,7,9,10,6,5,13,4,3);
-aWE("geom_object",14,15,3,4,7,5,11,12,13,10,9,16);
+aWE("geom_object",14,15,11,12,7,9,10,5,13,4,3,16);
 aWE("geometric",14);
-aWE("geometrical",1,2,3,4,6,8,7,5,11,12,13,10,9,16);
+aWE("geometrical",1,2,8,11,12,7,9,10,6,5,13,4,3,16);
 aWE("geometry",12);
-aWE("geompy",14,15,3,4,8,7,5,11,12,13,10,9,16);
+aWE("geompy",14,15,8,11,12,7,9,10,5,13,4,3,16);
-aWE("get",4,5,9);
+aWE("get",9,5,4);
 aWE("getfreeboundary",12);
 aWE("getobjectid",16);
 aWE("getsubshapeid",5);
 aWE("gg",1);
 aWE("giv",3);
-aWE("given",3,5,13,10);
+aWE("given",12,10,5,13,3);
-aWE("glu",10);
+aWE("glu",12,10);
 aWE("graphic",6);
 aWE("gravity",9);
 aWE("group",16);
 aWE("gui",10);
 aWE("half",3);
-aWE("hav",5,12);
+aWE("hav",12,5);
-aWE("height",7,11);
+aWE("height",11,7);
 aWE("hexahedral",14,10);
 aWE("hexahedron",14);
 aWE("hid",6);
@@ -294,15 +298,15 @@ aWE("i23",9);
 aWE("i31",9);
 aWE("i32",9);
 aWE("i33",9);
-aWE("id",1,6,5,12,10,16);
+aWE("id",1,12,10,6,5,16);
-aWE("if",5,12,10,9);
+aWE("if",12,9,10,5);
 aWE("ig",2,8);
 aWE("imag",13);
-aWE("import",2,6,8,9);
+aWE("import",2,8,9,6);
 aWE("importation",8);
 aWE("in",13);
 aWE("increas",12);
-aWE("independent",4,6);
+aWE("independent",6,4);
 aWE("indic",10);
 aWE("inertia",9);
 aWE("initial",13);
@@ -329,33 +333,33 @@ aWE("ix",9);
 aWE("iy",9);
 aWE("iz",9);
 aWE("just",14);
-aWE("last",3,5);
+aWE("last",5,3);
 aWE("lc",3);
 aWE("least",3);
 aWE("length",15,12,9);
 aWE("les",12);
 aWE("limit",10);
-aWE("lin",15,3,10);
+aWE("lin",15,10,3);
-aWE("list",15,3,7,5,12,10,16);
+aWE("list",15,12,7,10,5,3,16);
 aWE("listoffaceid",10);
 aWE("listofgeomshap",12);
-aWE("listofid",5,12);
+aWE("listofid",12,5);
 aWE("listofkeepinsid",10);
 aWE("listofmaterial",10);
 aWE("listofremoveinsid",10);
-aWE("listofshap",3,5,12,10);
+aWE("listofshap",12,10,5,3);
 aWE("listofshapeid",10);
 aWE("listoftool",10);
 aWE("listofwireid",12);
-aWE("local",15,3,12,13);
+aWE("local",15,12,13,3);
 aWE("locat",3);
-aWE("location",3,8);
+aWE("location",8,13,3);
 aWE("lwp",15);
 aWE("ly",15,12);
-aWE("main",0,3,4,6,7,5,11,12,10,9,16);
+aWE("main",0,11,12,7,9,10,6,5,4,3,16);
 aWE("mainshap",16);
-aWE("major",3,11);
+aWE("major",11,3);
-aWE("mak",13,10);
+aWE("mak",10,13);
 aWE("makearc",3);
 aWE("makebezi",3);
 aWE("makeblockexplod",10);
@@ -373,6 +377,7 @@ aWE("makeellips",3);
 aWE("makefac",5);
 aWE("makefil",7);
 aWE("makefillet",10);
+aWE("makegluefac",12);
 aWE("makehexasolid",14);
 aWE("makehexasolidtwofac",14);
 aWE("makeinterpol",3);
@@ -390,6 +395,7 @@ aWE("makepartition",10);
 aWE("makepip",7);
 aWE("makeplan",3);
 aWE("makepolylin",3);
+aWE("makeposition",13);
 aWE("makeprism",7);
 aWE("makequadfac",14);
 aWE("makequadfaceedg",14);
@@ -411,9 +417,9 @@ aWE("manual",3);
 aWE("mas",9);
 aWE("material",10);
 aWE("matrix",9);
-aWE("max",7,12,10);
+aWE("max",12,7,10);
 aWE("maxdegre",7);
-aWE("maximal",7,12,10,9);
+aWE("maximal",12,7,9,10);
 aWE("maximum",12,10);
 aWE("maxnbfac",10);
 aWE("maxtoleranc",12);
@@ -422,96 +428,100 @@ aWE("mean",15,13);
 aWE("measur",9);
 aWE("measurement",9);
 aWE("mention",14);
-aWE("menu",0,1,3,4,6,8,7,5,11,12,10,9,16);
+aWE("menu",0,1,8,11,12,7,9,10,6,5,4,3,16);
 aWE("merg",12);
 aWE("mesh",14,10);
 aWE("meshingdeflection",10);
 aWE("method",5);
 aWE("middl",3);
-aWE("min",7,10,9);
+aWE("min",7,9,10);
 aWE("mindegre",7);
 aWE("mindistanc",9);
-aWE("minimal",7,10,9);
+aWE("minimal",7,9,10);
 aWE("minimum",10);
 aWE("minnbfac",10);
-aWE("minor",3,11);
+aWE("minor",11,3);
 aWE("mirror",13);
 aWE("mod",1,12);
 aWE("model",2,10);
-aWE("modifi",3,12);
+aWE("modifi",12,13,3);
-aWE("modification",12);
+aWE("modification",12,13);
+aWE("modify",13);
 aWE("modul",2,6);
 aWE("moment",9);
 aWE("mov",13);
-aWE("multi",0,13,10);
+aWE("multi",0,10,13);
 aWE("must",12,13);
 aWE("nam",8,12);
 aWE("nbit",7);
 aWE("nbsplitpoint",12);
-aWE("nbtim",13,10);
+aWE("nbtim",10,13);
 aWE("nbtimes1",13);
 aWE("nbtimes2",13);
 aWE("nbtimesu",10);
 aWE("nbtimesv",10);
-aWE("necessary",15,6,12,9);
+aWE("necessary",15,12,9,6);
 aWE("need",12);
 aWE("negativ",13);
 aWE("neigbour",12);
-aWE("new",15,3,7,5,11,12,16);
+aWE("new",15,11,12,7,5,3,16);
 aWE("noerror",12);
-aWE("normal",3,7,13);
+aWE("normal",7,13,3);
 aWE("notion",14);
-aWE("numb",1,7,12,13,10);
+aWE("numb",1,12,7,10,13);
 aWE("number",10);
 aWE("numeb",10);
-aWE("object",1,2,3,4,6,8,7,5,11,12,13,10,9,16);
+aWE("object",1,2,8,11,12,7,9,10,6,5,13,4,3,16);
 aWE("occ",1,6);
 aWE("occur",12);
 aWE("offset",13);
 aWE("ok",8);
-aWE("on",4,6,12,13,10);
+aWE("on",15,12,10,6,13,4);
 aWE("open",12);
 aWE("openwir",12);
-aWE("operation",14,2,4,6,7,12,13,10,16);
+aWE("operation",14,2,12,7,10,6,13,4,16);
 aWE("operator",12);
 aWE("opposit",11);
 aWE("optimization",2);
 aWE("option",0);
 aWE("ord",12);
 aWE("orient",14,3);
-aWE("origin",3,11);
+aWE("origin",11,3);
 aWE("otherwis",12);
 aWE("outsid",10);
 aWE("ox",15,3);
 aWE("oy",3);
 aWE("oz",15,3);
-aWE("paramet",3,5,12);
+aWE("paramet",12,5,3);
-aWE("parameter",1,3,7,12);
+aWE("parameter",1,15,12,7,3);
 aWE("paramt",12);
-aWE("part",4,11);
+aWE("part",11,4);
 aWE("partition",10);
 aWE("pas",3);
 aWE("path",7);
 aWE("pathshap",7);
 aWE("pattern",13);
 aWE("perform",10,16);
+aWE("perpendicular",15);
 aWE("pip",7);
-aWE("plan",15,3,13,10);
+aWE("plan",15,10,13,3);
 aWE("planar",15,5);
 aWE("plung",10);
-aWE("point",14,15,3,11,12,13,9);
+aWE("point",14,15,11,12,9,13,3);
 aWE("point1",3);
 aWE("point2",3);
 aWE("point3",3);
 aWE("pointcoordinat",9);
 aWE("polylin",3);
 aWE("pop",1,6);
-aWE("position",3,12);
+aWE("position",12,3);
 aWE("possibility",12);
-aWE("possibl",6,12);
+aWE("possibl",12,6);
 aWE("precision",12);
+aWE("predefin",15);
 aWE("pres",3);
 aWE("preview",3);
+aWE("previou",15);
 aWE("primitiv",2,11);
 aWE("prism",7);
 aWE("problem",12);
@@ -522,16 +532,17 @@ aWE("put",10);
 aWE("python",9);
 aWE("quadrangl",14,3);
 aWE("radian",12);
-aWE("radiu",15,3,11,10);
+aWE("radiu",15,11,10,3);
-aWE("radius",3,11);
+aWE("radius",11,3);
 aWE("radius1",11);
 aWE("radius2",11);
-aWE("radiusmajor",3,11);
+aWE("radiusmajor",11,3);
-aWE("radiusminor",3,11);
+aWE("radiusminor",11,3);
 aWE("rang",2,12);
 aWE("re",12);
 aWE("reasonabl",6);
 aWE("reconstruction",10);
+aWE("relativ",15);
 aWE("remov",12,16);
 aWE("removeobject",16);
 aWE("removeweb",10);
@@ -539,57 +550,59 @@ aWE("repair",2,12);
 aWE("repetition",13);
 aWE("represent",3);
 aWE("request",5);
-aWE("requir",6,8,12);
+aWE("requir",8,12,6);
 aWE("requireddegre",12);
 aWE("requirednbsegment",12);
+aWE("respect",15,12);
 aWE("restriction",12);
-aWE("result",14,15,3,4,7,5,11,12,13,10,9,16);
+aWE("result",14,15,11,12,7,9,10,5,13,4,3,16);
 aWE("resultant",12);
 aWE("retriev",5);
-aWE("return",5,10,9,16);
+aWE("return",9,10,5,16);
-aWE("revolution",7,12);
+aWE("revolution",12,7);
 aWE("right",1,6);
 aWE("rotat",7,13);
 aWE("rotation",13);
-aWE("s",3,5,12,10,16);
+aWE("s",12,10,5,3,16);
 aWE("salom",2);
-aWE("sam",12);
+aWE("sam",15,12);
 aWE("sameparamet",12);
 aWE("scal",13);
 aWE("se",8);
 aWE("search",8);
-aWE("second",4,11,13,10);
+aWE("second",11,10,13,4);
-aWE("section",4,10);
+aWE("section",10,4);
 aWE("segment",15,12);
-aWE("select",0,1,15,3,4,6,8,7,5,11,12,10,9,16);
+aWE("select",0,1,15,8,11,12,7,9,10,6,5,4,3,16);
-aWE("selection",12,10);
+aWE("selection",15,12,10);
 aWE("sens",10);
 aWE("serv",7);
-aWE("set",1,3,12,13,10);
+aWE("set",1,12,10,13,3);
 aWE("setcolor",1);
 aWE("setdisplaymod",1);
 aWE("settransparency",1);
 aWE("sew",12);
 aWE("sg",6);
 aWE("shad",1);
-aWE("shap",1,2,15,4,6,8,7,5,12,13,10,9,16);
+aWE("shap",1,2,8,12,7,9,10,6,5,13,4,16);
-aWE("shape1",4,9);
+aWE("shape1",9,4);
-aWE("shape2",4,9);
+aWE("shape2",9,4);
+aWE("shapesto",12);
 aWE("shapetyp",10,16);
 aWE("shel",5,13);
-aWE("shell",14,7,5,12,13);
+aWE("shell",14,12,7,5,13);
 aWE("short",1);
 aWE("shown",3);
 aWE("sid",3);
 aWE("sign",13);
 aWE("six",14);
-aWE("siz",3,12,10);
+aWE("siz",12,10,3);
 aWE("sketch",15);
-aWE("small",3,12);
+aWE("small",12,3);
-aWE("solid",14,7,5,11,13,10);
+aWE("solid",14,11,7,10,5,13);
 aWE("soon",3);
-aWE("spac",3,9);
+aWE("spac",9,3);
-aWE("specifi",3,12,10);
+aWE("specifi",12,10,3);
 aWE("specific",14);
 aWE("specify",12);
 aWE("spher",11);
@@ -601,60 +614,66 @@ aWE("splitcontinuity",12);
 aWE("spot",12);
 aWE("stag",14);
 aWE("standard",8);
-aWE("start",15,3);
+aWE("start",15,13,3);
 aWE("step",14,2,8,13);
 aWE("step1",13);
 aWE("step2",13);
 aWE("str",15,8);
 aWE("strip",12);
 aWE("study",6);
-aWE("sub",5,12,16);
+aWE("sub",12,5,16);
-aWE("submenu",0,5,12,9);
+aWE("submenu",0,12,9,5);
-aWE("subshap",5,10,16);
+aWE("subshap",10,5,16);
 aWE("subshapeall",5);
 aWE("subshapeid",16);
 aWE("suppres",12);
 aWE("suppressfac",12);
 aWE("suppresshol",12);
 aWE("suppressinternalwir",12);
-aWE("surfac",12,13,9);
+aWE("surfac",12,9,13);
 aWE("surfacecontinuity",12);
 aWE("surfacemod",12);
 aWE("symmetrical",13);
 aWE("symmetry",11,13);
-aWE("system",3);
+aWE("system",13,3);
 aWE("tak",14);
-aWE("target",10);
+aWE("tangent",15);
+aWE("target",15,10);
 aWE("tetrahedral",14);
+aWE("theendlc",13);
 aWE("them",12);
+aWE("theobject",13);
 aWE("therefor",15);
+aWE("theshap",12);
+aWE("thestartlc",13);
+aWE("thetoleranc",12);
 aWE("tim",13);
 aWE("tobezi",12);
 aWE("tol2d",7);
 aWE("tol3d",7);
-aWE("toleranc",7,12,9);
+aWE("toleranc",12,7,9);
 aWE("tolerance2d",12);
 aWE("tolerance3d",12);
 aWE("tool",9);
 aWE("toru",11);
-aWE("transform",4,13,10);
+aWE("transform",10,13,4);
-aWE("transformation",0,2,13,10);
+aWE("transformation",0,2,10,13);
 aWE("translat",13);
-aWE("translation",13,10);
+aWE("translation",10,13);
 aWE("transparency",1);
 aWE("travers",12);
 aWE("trihedron",3);
 aWE("trimsiz",3);
-aWE("tru",12,10,9);
+aWE("tru",12,9,10);
-aWE("tui",14,1,15,3,4,6,8,7,5,11,12,13,10,9,16);
+aWE("tui",14,1,15,8,11,12,7,9,10,6,5,13,4,3,16);
 aWE("tupl",9);
-aWE("two",14,11,12,13,10);
+aWE("two",14,11,12,10,13);
-aWE("typ",15,4,5,11,12,10,9,16);
+aWE("typ",15,11,12,9,10,5,4,16);
 aWE("typeofshap",5);
 aWE("underly",12);
-aWE("up",1,6,11,10);
+aWE("up",1,11,10,6);
 aWE("updat",3);
-aWE("us",14,2,15,3,4,6,7,5,12,13,10,9);
+aWE("us",14,2,15,12,7,9,10,6,5,13,4,3);
 aWE("v1",14);
 aWE("v2",14);
 aWE("v3",14);
@@ -662,35 +681,36 @@ aWE("v4",14);
 aWE("val",12);
 aWE("valid",9);
 aWE("validity",9);
-aWE("valu",1,15,3,7,11,12,13,10,9);
+aWE("valu",1,15,11,12,7,9,10,13,3);
 aWE("variou",12);
-aWE("vector",3,7,11,13);
+aWE("vector",15,11,7,13,3);
-aWE("vertex",3,7,5,11,12,13,9);
+aWE("vertex",11,12,7,9,5,13,3);
 aWE("vertex1",5);
 aWE("vertex2",5);
 aWE("vertexmaxtol",9);
 aWE("vertexmintol",9);
-aWE("vertic",14,3,5,11,12);
+aWE("vertic",14,11,12,5,3);
-aWE("view",1,3,6);
+aWE("view",1,6,3);
 aWE("viewer",6);
 aWE("visibility",6);
 aWE("visualization",1,6);
 aWE("volum",9);
 aWE("vtk",6);
+aWE("vx",15);
 aWE("wantplanarfac",5);
 aWE("wat",10);
 aWE("waterdensity",10);
 aWE("weight",10);
 aWE("whati",9);
 aWE("whil",12);
-aWE("whos",5,9);
+aWE("whos",9,5);
 aWE("wid",2);
-aWE("will",8,12,13,10);
+aWE("will",8,12,10,13);
-aWE("wir",14,7,5,12);
+aWE("wir",14,12,7,5);
 aWE("wirefram",1);
 aWE("within",1,12);
-aWE("work",15,3,6,12,16);
+aWE("work",15,12,6,3,16);
-aWE("x",3,9);
+aWE("x",15,9,3);
 aWE("x1",11);
 aWE("x2",11);
 aWE("xdx",3);
@@ -700,7 +720,7 @@ aWE("xmax",9);
 aWE("xmin",9);
 aWE("xoy",15);
 aWE("xyz",3);
-aWE("y",3,9);
+aWE("y",15,9,3);
 aWE("y1",11);
 aWE("y2",11);
 aWE("ydx",3);
@@ -709,7 +729,7 @@ aWE("ydz",3);
 aWE("ymax",9);
 aWE("ymin",9);
 aWE("your",8,9);
-aWE("z",3,10,9);
+aWE("z",9,10,3);
 aWE("z1",11);
 aWE("z2",11);
 aWE("zmax",9);

doc/salome/gui/GEOM/whdata/whfwdata0.xml

@@ -3,23 +3,25 @@
 <key name="Ťapplyť"> 3, </key>
 <key name="Ťokť"> 3, </key>
 <key name="0"> 1,12, </key>
-<key name="1"> 1,15,3,4,7,5,11,12,13,10,9,16, </key>
+<key name="1"> 1,15,11,12,7,9,10,5,13,4,3,16, </key>
-<key name="1d"> 3,10, </key>
+<key name="1d"> 10,3, </key>
-<key name="1st"> 3,11,12,13,10, </key>
+<key name="1st"> 11,12,10,13,3, </key>
-<key name="2"> 14,1,15,3,4,5,11,12,13,10,9, </key>
+<key name="2"> 14,1,15,11,12,9,10,5,13,4,3, </key>
-<key name="2d"> 3,4,7,5,12,10, </key>
+<key name="2d"> 12,7,10,5,4,3, </key>
-<key name="2nd"> 3,11,12,13,10, </key>
+<key name="2nd"> 11,12,10,13,3, </key>
-<key name="3"> 15,3,4,11,12,13,10, </key>
+<key name="3"> 15,11,12,10,13,4,3, </key>
-<key name="3d"> 3,4,6,7,5,11,12,10,9, </key>
+<key name="3d"> 11,12,7,9,10,6,5,4,3, </key>
-<key name="3rd"> 3,10, </key>
+<key name="3rd"> 10,3, </key>
-<key name="4"> 14,4,12,10, </key>
+<key name="4"> 14,15,12,10,4, </key>
-<key name="5"> 7,12, </key>
+<key name="5"> 15,12,7, </key>
 <key name="6"> 14,12, </key>
 <key name="7"> 12, </key>
 <key name="8"> 12, </key>
 <key name="9"> 15,12, </key>
+<key name="90"> 15, </key>
 <key name="abl"> 15, </key>
-<key name="accord"> 3,12, </key>
+<key name="absolut"> 15, </key>
+<key name="accord"> 12,3, </key>
 <key name="accordanc"> 12, </key>
 <key name="achiev"> 12, </key>
 <key name="ad"> 12,16, </key>
@@ -30,8 +32,8 @@
 <key name="aim"> 10, </key>
 <key name="algorithm"> 10, </key>
 <key name="allow"> 14,15,8,13,16, </key>
-<key name="along"> 7,13,10, </key>
+<key name="along"> 7,10,13, </key>
-<key name="angl"> 15,7,12,13, </key>
+<key name="angl"> 15,12,7,13, </key>
 <key name="anoth"> 4, </key>
 <key name="any"> 12, </key>
 <key name="ap"> 12, </key>
@@ -41,75 +43,76 @@
 <key name="approximation"> 12, </key>
 <key name="arc"> 15,3, </key>
 <key name="archimed"> 10, </key>
-<key name="argument"> 14,1,15,3,4,7,5,11,12,13,10,9,16, </key>
+<key name="argument"> 14,1,15,11,12,7,9,10,5,13,4,3,16, </key>
 <key name="around"> 7, </key>
 <key name="associat"> 6, </key>
 <key name="attribut"> 6, </key>
 <key name="automatical"> 14,3, </key>
 <key name="availabl"> 6, </key>
 <key name="ax"> 3, </key>
-<key name="axi"> 3,7,11,13,9, </key>
+<key name="axi"> 11,7,9,13,3, </key>
 <key name="b"> 3, </key>
 <key name="back"> 12, </key>
-<key name="bas"> 7,11,12,13, </key>
+<key name="bas"> 11,12,7,13, </key>
 <key name="baseshap"> 7, </key>
 <key name="basi"> 7, </key>
-<key name="basic"> 2,15,3,5,10,9, </key>
+<key name="basic"> 2,15,9,10,5,3, </key>
 <key name="basicproperti"> 9, </key>
 <key name="befor"> 15,12, </key>
 <key name="below"> 14, </key>
-<key name="bezi"> 3,12, </key>
+<key name="bezi"> 12,3, </key>
 <key name="block"> 14,0,10, </key>
-<key name="boolean"> 2,4,5,9, </key>
+<key name="boolean"> 2,9,5,4, </key>
 <key name="both"> 6, </key>
 <key name="bound"> 9, </key>
 <key name="boundari"> 12, </key>
 <key name="boundary"> 12, </key>
 <key name="boundingbox"> 9, </key>
-<key name="box"> 14,1,15,3,4,8,7,5,11,12,13,10,9,16, </key>
+<key name="box"> 14,1,15,8,11,12,7,9,10,5,13,4,3,16, </key>
 <key name="brep"> 2,8, </key>
-<key name="brows"> 3,6,8, </key>
+<key name="brows"> 8,6,3, </key>
 <key name="bsplin"> 12, </key>
 <key name="bsplinerestriction"> 12, </key>
-<key name="build"> 14,0,2,5,10, </key>
+<key name="build"> 14,0,2,10,5, </key>
 <key name="button"> 3, </key>
 <key name="bypas"> 14, </key>
 <key name="cad"> 2, </key>
 <key name="camera"> 3, </key>
-<key name="cas"> 14,3,12, </key>
+<key name="cas"> 14,12,3, </key>
-<key name="cent"> 15,3,11,13,9, </key>
+<key name="cent"> 15,11,9,13,3, </key>
 <key name="centerofscal"> 13, </key>
 <key name="central"> 11, </key>
 <key name="chamf"> 10, </key>
 <key name="chang"> 1, </key>
-<key name="check"> 12,10,9, </key>
+<key name="check"> 12,9,10, </key>
 <key name="checkshap"> 9, </key>
-<key name="choos"> 6,8,10, </key>
+<key name="choos"> 8,10,6, </key>
 <key name="circl"> 3, </key>
-<key name="click"> 1,6,8, </key>
+<key name="click"> 1,8,6, </key>
-<key name="clos"> 5,12, </key>
+<key name="clos"> 12,5, </key>
 <key name="closecontour"> 12, </key>
 <key name="closedwir"> 12, </key>
 <key name="closur"> 12, </key>
+<key name="coincident"> 12, </key>
 <key name="color"> 1, </key>
-<key name="command"> 14,1,15,3,4,6,8,7,5,11,12,13,10,9,16, </key>
+<key name="command"> 14,1,15,8,11,12,7,9,10,6,5,13,4,3,16, </key>
-<key name="common"> 4,12, </key>
+<key name="common"> 12,4, </key>
-<key name="complex"> 2,4,7,10, </key>
+<key name="complex"> 2,7,10,4, </key>
-<key name="component"> 3,13, </key>
+<key name="component"> 15,13,3, </key>
 <key name="compos"> 14,9, </key>
-<key name="compound"> 14,4,5,13,10, </key>
+<key name="compound"> 14,12,10,5,13,4, </key>
 <key name="compsolid"> 7, </key>
-<key name="comput"> 10,9, </key>
+<key name="comput"> 9,10, </key>
 <key name="con"> 11, </key>
 <key name="concern"> 9, </key>
 <key name="confirm"> 8, </key>
 <key name="conical"> 12, </key>
-<key name="connect"> 5,10, </key>
+<key name="connect"> 10,5, </key>
 <key name="consider"> 12, </key>
 <key name="constraint"> 14, </key>
-<key name="construct"> 14,5,11, </key>
+<key name="construct"> 14,11,5, </key>
 <key name="construction"> 2,4, </key>
-<key name="constructor"> 3,11,12,13,10, </key>
+<key name="constructor"> 11,12,10,13,3, </key>
 <key name="contain"> 15,8,12, </key>
 <key name="content"> 8, </key>
 <key name="context"> 12, </key>
@@ -119,51 +122,51 @@
 <key name="continuity3d"> 12, </key>
 <key name="contour"> 12, </key>
 <key name="conversion"> 12, </key>
-<key name="coordinat"> 15,3,11,13,9, </key>
+<key name="coordinat"> 15,11,9,13,3, </key>
 <key name="copy"> 13, </key>
 <key name="corner"> 11, </key>
 <key name="correction"> 12, </key>
-<key name="correspond"> 3,7,5,11,12,10, </key>
+<key name="correspond"> 11,12,7,10,5,3, </key>
 <key name="coupl"> 15, </key>
-<key name="creat"> 14,15,3,6,7,5,11,12,13,10,9,16, </key>
+<key name="creat"> 14,15,11,12,7,9,10,6,5,13,3,16, </key>
 <key name="creategroup"> 16, </key>
-<key name="creation"> 2,7,12,10, </key>
+<key name="creation"> 2,12,7,10, </key>
 <key name="current"> 15,6, </key>
-<key name="curv"> 15,3,7,12, </key>
+<key name="curv"> 15,12,7,3, </key>
 <key name="curve2dmod"> 12, </key>
 <key name="curve3dmod"> 12, </key>
 <key name="curvecontinuity"> 12, </key>
-<key name="cut"> 4,12, </key>
+<key name="cut"> 12,4, </key>
 <key name="cylind"> 11, </key>
 <key name="cylindrical"> 12, </key>
 <key name="d1"> 10, </key>
 <key name="d2"> 10, </key>
 <key name="data"> 9, </key>
 <key name="default"> 15, </key>
-<key name="defin"> 15,3,11,12,10, </key>
+<key name="defin"> 15,11,12,10,3, </key>
 <key name="definit"> 9, </key>
-<key name="definition"> 7,12, </key>
+<key name="definition"> 12,7, </key>
 <key name="deflection"> 10, </key>
-<key name="degre"> 7,12, </key>
+<key name="degre"> 15,12,7, </key>
 <key name="delet"> 10, </key>
 <key name="density"> 10, </key>
 <key name="depend"> 10, </key>
 <key name="describ"> 8, </key>
-<key name="description"> 14,1,15,3,4,6,7,5,11,12,13,10,9,16, </key>
+<key name="description"> 14,1,15,11,12,7,9,10,6,5,13,4,3,16, </key>
 <key name="desir"> 12, </key>
 <key name="destin"> 2, </key>
 <key name="destination"> 15, </key>
 <key name="detect"> 12, </key>
 <key name="detection"> 12, </key>
 <key name="diagonal"> 11, </key>
-<key name="dialog"> 14,1,15,3,4,8,7,5,11,12,13,10,9,16, </key>
+<key name="dialog"> 14,1,15,8,11,12,7,9,10,5,13,4,3,16, </key>
 <key name="dif"> 6, </key>
-<key name="different"> 1,6,11,9, </key>
+<key name="different"> 1,11,9,6, </key>
-<key name="dimension"> 7,11,10,9, </key>
+<key name="dimension"> 11,7,9,10, </key>
 <key name="dir"> 13, </key>
 <key name="dir1"> 13, </key>
 <key name="dir2"> 13, </key>
-<key name="direction"> 15,3,7,11,13,10, </key>
+<key name="direction"> 15,11,7,10,13,3, </key>
 <key name="dirface1v"> 10, </key>
 <key name="dirfaceid1"> 10, </key>
 <key name="dirfaceid1u"> 10, </key>
@@ -171,45 +174,46 @@
 <key name="dirfaceid2"> 10, </key>
 <key name="dirfaceid2u"> 10, </key>
 <key name="dirfaceid2v"> 10, </key>
-<key name="display"> 1,3,6,8,9, </key>
+<key name="display"> 1,8,9,6,3, </key>
 <key name="displayall"> 6, </key>
 <key name="displayon"> 6, </key>
-<key name="distanc"> 13,9, </key>
+<key name="distanc"> 12,9,13, </key>
 <key name="divid"> 12, </key>
 <key name="divideedg"> 12, </key>
 <key name="don"> 12,13, </key>
 <key name="doubl"> 1,15, </key>
 <key name="dropsmalledg"> 12, </key>
-<key name="dx"> 13, </key>
+<key name="dx"> 15,13, </key>
-<key name="dy"> 13, </key>
+<key name="dy"> 15,13, </key>
 <key name="dz"> 13, </key>
 <key name="e"> 6, </key>
 <key name="e1"> 14, </key>
 <key name="e2"> 14, </key>
 <key name="e3"> 14, </key>
 <key name="e4"> 14, </key>
-<key name="edg"> 14,3,7,5,11,12,13,10, </key>
+<key name="edg"> 14,11,12,7,10,5,13,3, </key>
 <key name="edgeid"> 12, </key>
 <key name="edit"> 16, </key>
 <key name="egdemaxtol"> 9, </key>
 <key name="egdemintol"> 9, </key>
 <key name="eith"> 14, </key>
-<key name="element"> 3,4,6,7,5,11,12,9, </key>
+<key name="element"> 15,11,12,7,9,6,5,4,3, </key>
 <key name="elementary"> 14, </key>
 <key name="ellips"> 3, </key>
 <key name="empty"> 12, </key>
-<key name="end"> 15,3,12, </key>
+<key name="end"> 15,12,13,3, </key>
-<key name="ent"> 3,8, </key>
+<key name="ent"> 8,3, </key>
-<key name="entity"> 15,3,7,5,11,16, </key>
+<key name="entity"> 15,11,7,5,3,16, </key>
+<key name="equal"> 15, </key>
 <key name="eras"> 6, </key>
 <key name="eraseall"> 6, </key>
 <key name="eraseon"> 6, </key>
 <key name="error"> 12, </key>
-<key name="etc"> 5,12, </key>
+<key name="etc"> 12,5, </key>
-<key name="exampl"> 14,1,3,4,7,5,11,12,13,10,16, </key>
+<key name="exampl"> 14,1,15,11,12,7,10,5,13,4,3,16, </key>
 <key name="except"> 12, </key>
-<key name="exist"> 16, </key>
+<key name="exist"> 15,16, </key>
-<key name="explod"> 0,5,10, </key>
+<key name="explod"> 0,10,5, </key>
 <key name="export"> 2,8, </key>
 <key name="exportation"> 8, </key>
 <key name="extract"> 10, </key>
@@ -221,7 +225,7 @@
 <key name="f4"> 14, </key>
 <key name="f5"> 14, </key>
 <key name="f6"> 14, </key>
-<key name="fac"> 14,3,7,5,12,13,10, </key>
+<key name="fac"> 14,12,7,10,5,13,3, </key>
 <key name="face1"> 10, </key>
 <key name="face2"> 10, </key>
 <key name="facemaxtol"> 9, </key>
@@ -229,15 +233,15 @@
 <key name="factor"> 13, </key>
 <key name="fals"> 12, </key>
 <key name="field"> 3, </key>
-<key name="fil"> 3,8,7, </key>
+<key name="fil"> 8,7,3, </key>
 <key name="filenam"> 8, </key>
 <key name="fill"> 7, </key>
 <key name="fillet"> 10, </key>
-<key name="first"> 3,4,5,11,13,10, </key>
+<key name="first"> 11,10,5,13,4,3, </key>
 <key name="fix"> 12, </key>
 <key name="fixfacesiz"> 12, </key>
 <key name="fixshap"> 12, </key>
-<key name="follow"> 14,4,6,5, </key>
+<key name="follow"> 14,6,5,4, </key>
 <key name="format"> 2,8, </key>
 <key name="formatnam"> 8, </key>
 <key name="four"> 14, </key>
@@ -248,27 +252,27 @@
 <key name="general"> 14, </key>
 <key name="generat"> 7, </key>
 <key name="generation"> 2,7, </key>
-<key name="geom"> 1,2,3,4,6,8,7,5,11,13,10,9, </key>
+<key name="geom"> 1,2,8,11,7,9,10,6,5,13,4,3, </key>
-<key name="geom_object"> 14,15,3,4,7,5,11,12,13,10,9,16, </key>
+<key name="geom_object"> 14,15,11,12,7,9,10,5,13,4,3,16, </key>
 <key name="geometric"> 14, </key>
-<key name="geometrical"> 1,2,3,4,6,8,7,5,11,12,13,10,9,16, </key>
+<key name="geometrical"> 1,2,8,11,12,7,9,10,6,5,13,4,3,16, </key>
 <key name="geometry"> 12, </key>
-<key name="geompy"> 14,15,3,4,8,7,5,11,12,13,10,9,16, </key>
+<key name="geompy"> 14,15,8,11,12,7,9,10,5,13,4,3,16, </key>
-<key name="get"> 4,5,9, </key>
+<key name="get"> 9,5,4, </key>
 <key name="getfreeboundary"> 12, </key>
 <key name="getobjectid"> 16, </key>
 <key name="getsubshapeid"> 5, </key>
 <key name="gg"> 1, </key>
 <key name="giv"> 3, </key>
-<key name="given"> 3,5,13,10, </key>
+<key name="given"> 12,10,5,13,3, </key>
-<key name="glu"> 10, </key>
+<key name="glu"> 12,10, </key>
 <key name="graphic"> 6, </key>
 <key name="gravity"> 9, </key>
 <key name="group"> 16, </key>
 <key name="gui"> 10, </key>
 <key name="half"> 3, </key>
-<key name="hav"> 5,12, </key>
+<key name="hav"> 12,5, </key>
-<key name="height"> 7,11, </key>
+<key name="height"> 11,7, </key>
 <key name="hexahedral"> 14,10, </key>
 <key name="hexahedron"> 14, </key>
 <key name="hid"> 6, </key>
@@ -284,15 +288,15 @@
 <key name="i31"> 9, </key>
 <key name="i32"> 9, </key>
 <key name="i33"> 9, </key>
-<key name="id"> 1,6,5,12,10,16, </key>
+<key name="id"> 1,12,10,6,5,16, </key>
-<key name="if"> 5,12,10,9, </key>
+<key name="if"> 12,9,10,5, </key>
 <key name="ig"> 2,8, </key>
 <key name="imag"> 13, </key>
-<key name="import"> 2,6,8,9, </key>
+<key name="import"> 2,8,9,6, </key>
 <key name="importation"> 8, </key>
 <key name="in"> 13, </key>
 <key name="increas"> 12, </key>
-<key name="independent"> 4,6, </key>
+<key name="independent"> 6,4, </key>
 <key name="indic"> 10, </key>
 <key name="inertia"> 9, </key>
 <key name="initial"> 13, </key>
@@ -319,33 +323,33 @@
 <key name="iy"> 9, </key>
 <key name="iz"> 9, </key>
 <key name="just"> 14, </key>
-<key name="last"> 3,5, </key>
+<key name="last"> 5,3, </key>
 <key name="lc"> 3, </key>
 <key name="least"> 3, </key>
 <key name="length"> 15,12,9, </key>
 <key name="les"> 12, </key>
 <key name="limit"> 10, </key>
-<key name="lin"> 15,3,10, </key>
+<key name="lin"> 15,10,3, </key>
-<key name="list"> 15,3,7,5,12,10,16, </key>
+<key name="list"> 15,12,7,10,5,3,16, </key>
 <key name="listoffaceid"> 10, </key>
 <key name="listofgeomshap"> 12, </key>
-<key name="listofid"> 5,12, </key>
+<key name="listofid"> 12,5, </key>
 <key name="listofkeepinsid"> 10, </key>
 <key name="listofmaterial"> 10, </key>
 <key name="listofremoveinsid"> 10, </key>
-<key name="listofshap"> 3,5,12,10, </key>
+<key name="listofshap"> 12,10,5,3, </key>
 <key name="listofshapeid"> 10, </key>
 <key name="listoftool"> 10, </key>
 <key name="listofwireid"> 12, </key>
-<key name="local"> 15,3,12,13, </key>
+<key name="local"> 15,12,13,3, </key>
 <key name="locat"> 3, </key>
-<key name="location"> 3,8, </key>
+<key name="location"> 8,13,3, </key>
 <key name="lwp"> 15, </key>
 <key name="ly"> 15,12, </key>
-<key name="main"> 0,3,4,6,7,5,11,12,10,9,16, </key>
+<key name="main"> 0,11,12,7,9,10,6,5,4,3,16, </key>
 <key name="mainshap"> 16, </key>
-<key name="major"> 3,11, </key>
+<key name="major"> 11,3, </key>
-<key name="mak"> 13,10, </key>
+<key name="mak"> 10,13, </key>
 <key name="makearc"> 3, </key>
 <key name="makebezi"> 3, </key>
 <key name="makeblockexplod"> 10, </key>
@@ -363,6 +367,7 @@
 <key name="makefac"> 5, </key>
 <key name="makefil"> 7, </key>
 <key name="makefillet"> 10, </key>
+<key name="makegluefac"> 12, </key>
 <key name="makehexasolid"> 14, </key>
 <key name="makehexasolidtwofac"> 14, </key>
 <key name="makeinterpol"> 3, </key>
@@ -380,6 +385,7 @@
 <key name="makepip"> 7, </key>
 <key name="makeplan"> 3, </key>
 <key name="makepolylin"> 3, </key>
+<key name="makeposition"> 13, </key>
 <key name="makeprism"> 7, </key>
 <key name="makequadfac"> 14, </key>
 <key name="makequadfaceedg"> 14, </key>
@@ -401,9 +407,9 @@
 <key name="mas"> 9, </key>
 <key name="material"> 10, </key>
 <key name="matrix"> 9, </key>
-<key name="max"> 7,12,10, </key>
+<key name="max"> 12,7,10, </key>
 <key name="maxdegre"> 7, </key>
-<key name="maximal"> 7,12,10,9, </key>
+<key name="maximal"> 12,7,9,10, </key>
 <key name="maximum"> 12,10, </key>
 <key name="maxnbfac"> 10, </key>
 <key name="maxtoleranc"> 12, </key>
@@ -412,96 +418,100 @@
 <key name="measur"> 9, </key>
 <key name="measurement"> 9, </key>
 <key name="mention"> 14, </key>
-<key name="menu"> 0,1,3,4,6,8,7,5,11,12,10,9,16, </key>
+<key name="menu"> 0,1,8,11,12,7,9,10,6,5,4,3,16, </key>
 <key name="merg"> 12, </key>
 <key name="mesh"> 14,10, </key>
 <key name="meshingdeflection"> 10, </key>
 <key name="method"> 5, </key>
 <key name="middl"> 3, </key>
-<key name="min"> 7,10,9, </key>
+<key name="min"> 7,9,10, </key>
 <key name="mindegre"> 7, </key>
 <key name="mindistanc"> 9, </key>
-<key name="minimal"> 7,10,9, </key>
+<key name="minimal"> 7,9,10, </key>
 <key name="minimum"> 10, </key>
 <key name="minnbfac"> 10, </key>
-<key name="minor"> 3,11, </key>
+<key name="minor"> 11,3, </key>
 <key name="mirror"> 13, </key>
 <key name="mod"> 1,12, </key>
 <key name="model"> 2,10, </key>
-<key name="modifi"> 3,12, </key>
+<key name="modifi"> 12,13,3, </key>
-<key name="modification"> 12, </key>
+<key name="modification"> 12,13, </key>
+<key name="modify"> 13, </key>
 <key name="modul"> 2,6, </key>
 <key name="moment"> 9, </key>
 <key name="mov"> 13, </key>
-<key name="multi"> 0,13,10, </key>
+<key name="multi"> 0,10,13, </key>
 <key name="must"> 12,13, </key>
 <key name="nam"> 8,12, </key>
 <key name="nbit"> 7, </key>
 <key name="nbsplitpoint"> 12, </key>
-<key name="nbtim"> 13,10, </key>
+<key name="nbtim"> 10,13, </key>
 <key name="nbtimes1"> 13, </key>
 <key name="nbtimes2"> 13, </key>
 <key name="nbtimesu"> 10, </key>
 <key name="nbtimesv"> 10, </key>
-<key name="necessary"> 15,6,12,9, </key>
+<key name="necessary"> 15,12,9,6, </key>
 <key name="need"> 12, </key>
 <key name="negativ"> 13, </key>
 <key name="neigbour"> 12, </key>
-<key name="new"> 15,3,7,5,11,12,16, </key>
+<key name="new"> 15,11,12,7,5,3,16, </key>
 <key name="noerror"> 12, </key>
-<key name="normal"> 3,7,13, </key>
+<key name="normal"> 7,13,3, </key>
 <key name="notion"> 14, </key>
-<key name="numb"> 1,7,12,13,10, </key>
+<key name="numb"> 1,12,7,10,13, </key>
 <key name="number"> 10, </key>
 <key name="numeb"> 10, </key>
-<key name="object"> 1,2,3,4,6,8,7,5,11,12,13,10,9,16, </key>
+<key name="object"> 1,2,8,11,12,7,9,10,6,5,13,4,3,16, </key>
 <key name="occ"> 1,6, </key>
 <key name="occur"> 12, </key>
 <key name="offset"> 13, </key>
 <key name="ok"> 8, </key>
-<key name="on"> 4,6,12,13,10, </key>
+<key name="on"> 15,12,10,6,13,4, </key>
 <key name="open"> 12, </key>
 <key name="openwir"> 12, </key>
-<key name="operation"> 14,2,4,6,7,12,13,10,16, </key>
+<key name="operation"> 14,2,12,7,10,6,13,4,16, </key>
 <key name="operator"> 12, </key>
 <key name="opposit"> 11, </key>
 <key name="optimization"> 2, </key>
 <key name="option"> 0, </key>
 <key name="ord"> 12, </key>
 <key name="orient"> 14,3, </key>
-<key name="origin"> 3,11, </key>
+<key name="origin"> 11,3, </key>
 <key name="otherwis"> 12, </key>
 <key name="outsid"> 10, </key>
 <key name="ox"> 15,3, </key>
 <key name="oy"> 3, </key>
 <key name="oz"> 15,3, </key>
-<key name="paramet"> 3,5,12, </key>
+<key name="paramet"> 12,5,3, </key>
-<key name="parameter"> 1,3,7,12, </key>
+<key name="parameter"> 1,15,12,7,3, </key>
 <key name="paramt"> 12, </key>
-<key name="part"> 4,11, </key>
+<key name="part"> 11,4, </key>
 <key name="partition"> 10, </key>
 <key name="pas"> 3, </key>
 <key name="path"> 7, </key>
 <key name="pathshap"> 7, </key>
 <key name="pattern"> 13, </key>
 <key name="perform"> 10,16, </key>
+<key name="perpendicular"> 15, </key>
 <key name="pip"> 7, </key>
-<key name="plan"> 15,3,13,10, </key>
+<key name="plan"> 15,10,13,3, </key>
 <key name="planar"> 15,5, </key>
 <key name="plung"> 10, </key>
-<key name="point"> 14,15,3,11,12,13,9, </key>
+<key name="point"> 14,15,11,12,9,13,3, </key>
 <key name="point1"> 3, </key>
 <key name="point2"> 3, </key>
 <key name="point3"> 3, </key>
 <key name="pointcoordinat"> 9, </key>
 <key name="polylin"> 3, </key>
 <key name="pop"> 1,6, </key>
-<key name="position"> 3,12, </key>
+<key name="position"> 12,3, </key>
 <key name="possibility"> 12, </key>
-<key name="possibl"> 6,12, </key>
+<key name="possibl"> 12,6, </key>
 <key name="precision"> 12, </key>
+<key name="predefin"> 15, </key>
 <key name="pres"> 3, </key>
 <key name="preview"> 3, </key>
+<key name="previou"> 15, </key>
 <key name="primitiv"> 2,11, </key>
 <key name="prism"> 7, </key>
 <key name="problem"> 12, </key>
@@ -512,16 +522,17 @@
 <key name="python"> 9, </key>
 <key name="quadrangl"> 14,3, </key>
 <key name="radian"> 12, </key>
-<key name="radiu"> 15,3,11,10, </key>
+<key name="radiu"> 15,11,10,3, </key>
-<key name="radius"> 3,11, </key>
+<key name="radius"> 11,3, </key>
 <key name="radius1"> 11, </key>
 <key name="radius2"> 11, </key>
-<key name="radiusmajor"> 3,11, </key>
+<key name="radiusmajor"> 11,3, </key>
-<key name="radiusminor"> 3,11, </key>
+<key name="radiusminor"> 11,3, </key>
 <key name="rang"> 2,12, </key>
 <key name="re"> 12, </key>
 <key name="reasonabl"> 6, </key>
 <key name="reconstruction"> 10, </key>
+<key name="relativ"> 15, </key>
 <key name="remov"> 12,16, </key>
 <key name="removeobject"> 16, </key>
 <key name="removeweb"> 10, </key>
@@ -529,57 +540,59 @@
 <key name="repetition"> 13, </key>
 <key name="represent"> 3, </key>
 <key name="request"> 5, </key>
-<key name="requir"> 6,8,12, </key>
+<key name="requir"> 8,12,6, </key>
 <key name="requireddegre"> 12, </key>
 <key name="requirednbsegment"> 12, </key>
+<key name="respect"> 15,12, </key>
 <key name="restriction"> 12, </key>
-<key name="result"> 14,15,3,4,7,5,11,12,13,10,9,16, </key>
+<key name="result"> 14,15,11,12,7,9,10,5,13,4,3,16, </key>
 <key name="resultant"> 12, </key>
 <key name="retriev"> 5, </key>
-<key name="return"> 5,10,9,16, </key>
+<key name="return"> 9,10,5,16, </key>
-<key name="revolution"> 7,12, </key>
+<key name="revolution"> 12,7, </key>
 <key name="right"> 1,6, </key>
 <key name="rotat"> 7,13, </key>
 <key name="rotation"> 13, </key>
-<key name="s"> 3,5,12,10,16, </key>
+<key name="s"> 12,10,5,3,16, </key>
 <key name="salom"> 2, </key>
-<key name="sam"> 12, </key>
+<key name="sam"> 15,12, </key>
 <key name="sameparamet"> 12, </key>
 <key name="scal"> 13, </key>
 <key name="se"> 8, </key>
 <key name="search"> 8, </key>
-<key name="second"> 4,11,13,10, </key>
+<key name="second"> 11,10,13,4, </key>
-<key name="section"> 4,10, </key>
+<key name="section"> 10,4, </key>
 <key name="segment"> 15,12, </key>
-<key name="select"> 0,1,15,3,4,6,8,7,5,11,12,10,9,16, </key>
+<key name="select"> 0,1,15,8,11,12,7,9,10,6,5,4,3,16, </key>
-<key name="selection"> 12,10, </key>
+<key name="selection"> 15,12,10, </key>
 <key name="sens"> 10, </key>
 <key name="serv"> 7, </key>
-<key name="set"> 1,3,12,13,10, </key>
+<key name="set"> 1,12,10,13,3, </key>
 <key name="setcolor"> 1, </key>
 <key name="setdisplaymod"> 1, </key>
 <key name="settransparency"> 1, </key>
 <key name="sew"> 12, </key>
 <key name="sg"> 6, </key>
 <key name="shad"> 1, </key>
-<key name="shap"> 1,2,15,4,6,8,7,5,12,13,10,9,16, </key>
+<key name="shap"> 1,2,8,12,7,9,10,6,5,13,4,16, </key>
-<key name="shape1"> 4,9, </key>
+<key name="shape1"> 9,4, </key>
-<key name="shape2"> 4,9, </key>
+<key name="shape2"> 9,4, </key>
+<key name="shapesto"> 12, </key>
 <key name="shapetyp"> 10,16, </key>
 <key name="shel"> 5,13, </key>
-<key name="shell"> 14,7,5,12,13, </key>
+<key name="shell"> 14,12,7,5,13, </key>
 <key name="short"> 1, </key>
 <key name="shown"> 3, </key>
 <key name="sid"> 3, </key>
 <key name="sign"> 13, </key>
 <key name="six"> 14, </key>
-<key name="siz"> 3,12,10, </key>
+<key name="siz"> 12,10,3, </key>
 <key name="sketch"> 15, </key>
-<key name="small"> 3,12, </key>
+<key name="small"> 12,3, </key>
-<key name="solid"> 14,7,5,11,13,10, </key>
+<key name="solid"> 14,11,7,10,5,13, </key>
 <key name="soon"> 3, </key>
-<key name="spac"> 3,9, </key>
+<key name="spac"> 9,3, </key>
-<key name="specifi"> 3,12,10, </key>
+<key name="specifi"> 12,10,3, </key>
 <key name="specific"> 14, </key>
 <key name="specify"> 12, </key>
 <key name="spher"> 11, </key>
@@ -591,60 +604,66 @@
 <key name="spot"> 12, </key>
 <key name="stag"> 14, </key>
 <key name="standard"> 8, </key>
-<key name="start"> 15,3, </key>
+<key name="start"> 15,13,3, </key>
 <key name="step"> 14,2,8,13, </key>
 <key name="step1"> 13, </key>
 <key name="step2"> 13, </key>
 <key name="str"> 15,8, </key>
 <key name="strip"> 12, </key>
 <key name="study"> 6, </key>
-<key name="sub"> 5,12,16, </key>
+<key name="sub"> 12,5,16, </key>
-<key name="submenu"> 0,5,12,9, </key>
+<key name="submenu"> 0,12,9,5, </key>
-<key name="subshap"> 5,10,16, </key>
+<key name="subshap"> 10,5,16, </key>
 <key name="subshapeall"> 5, </key>
 <key name="subshapeid"> 16, </key>
 <key name="suppres"> 12, </key>
 <key name="suppressfac"> 12, </key>
 <key name="suppresshol"> 12, </key>
 <key name="suppressinternalwir"> 12, </key>
-<key name="surfac"> 12,13,9, </key>
+<key name="surfac"> 12,9,13, </key>
 <key name="surfacecontinuity"> 12, </key>
 <key name="surfacemod"> 12, </key>
 <key name="symmetrical"> 13, </key>
 <key name="symmetry"> 11,13, </key>
-<key name="system"> 3, </key>
+<key name="system"> 13,3, </key>
 <key name="tak"> 14, </key>
-<key name="target"> 10, </key>
+<key name="tangent"> 15, </key>
+<key name="target"> 15,10, </key>
 <key name="tetrahedral"> 14, </key>
+<key name="theendlc"> 13, </key>
 <key name="them"> 12, </key>
+<key name="theobject"> 13, </key>
 <key name="therefor"> 15, </key>
+<key name="theshap"> 12, </key>
+<key name="thestartlc"> 13, </key>
+<key name="thetoleranc"> 12, </key>
 <key name="tim"> 13, </key>
 <key name="tobezi"> 12, </key>
 <key name="tol2d"> 7, </key>
 <key name="tol3d"> 7, </key>
-<key name="toleranc"> 7,12,9, </key>
+<key name="toleranc"> 12,7,9, </key>
 <key name="tolerance2d"> 12, </key>
 <key name="tolerance3d"> 12, </key>
 <key name="tool"> 9, </key>
 <key name="toru"> 11, </key>
-<key name="transform"> 4,13,10, </key>
+<key name="transform"> 10,13,4, </key>
-<key name="transformation"> 0,2,13,10, </key>
+<key name="transformation"> 0,2,10,13, </key>
 <key name="translat"> 13, </key>
-<key name="translation"> 13,10, </key>
+<key name="translation"> 10,13, </key>
 <key name="transparency"> 1, </key>
 <key name="travers"> 12, </key>
 <key name="trihedron"> 3, </key>
 <key name="trimsiz"> 3, </key>
-<key name="tru"> 12,10,9, </key>
+<key name="tru"> 12,9,10, </key>
-<key name="tui"> 14,1,15,3,4,6,8,7,5,11,12,13,10,9,16, </key>
+<key name="tui"> 14,1,15,8,11,12,7,9,10,6,5,13,4,3,16, </key>
 <key name="tupl"> 9, </key>
-<key name="two"> 14,11,12,13,10, </key>
+<key name="two"> 14,11,12,10,13, </key>
-<key name="typ"> 15,4,5,11,12,10,9,16, </key>
+<key name="typ"> 15,11,12,9,10,5,4,16, </key>
 <key name="typeofshap"> 5, </key>
 <key name="underly"> 12, </key>
-<key name="up"> 1,6,11,10, </key>
+<key name="up"> 1,11,10,6, </key>
 <key name="updat"> 3, </key>
-<key name="us"> 14,2,15,3,4,6,7,5,12,13,10,9, </key>
+<key name="us"> 14,2,15,12,7,9,10,6,5,13,4,3, </key>
 <key name="v1"> 14, </key>
 <key name="v2"> 14, </key>
 <key name="v3"> 14, </key>
@@ -652,35 +671,36 @@
 <key name="val"> 12, </key>
 <key name="valid"> 9, </key>
 <key name="validity"> 9, </key>
-<key name="valu"> 1,15,3,7,11,12,13,10,9, </key>
+<key name="valu"> 1,15,11,12,7,9,10,13,3, </key>
 <key name="variou"> 12, </key>
-<key name="vector"> 3,7,11,13, </key>
+<key name="vector"> 15,11,7,13,3, </key>
-<key name="vertex"> 3,7,5,11,12,13,9, </key>
+<key name="vertex"> 11,12,7,9,5,13,3, </key>
 <key name="vertex1"> 5, </key>
 <key name="vertex2"> 5, </key>
 <key name="vertexmaxtol"> 9, </key>
 <key name="vertexmintol"> 9, </key>
-<key name="vertic"> 14,3,5,11,12, </key>
+<key name="vertic"> 14,11,12,5,3, </key>
-<key name="view"> 1,3,6, </key>
+<key name="view"> 1,6,3, </key>
 <key name="viewer"> 6, </key>
 <key name="visibility"> 6, </key>
 <key name="visualization"> 1,6, </key>
 <key name="volum"> 9, </key>
 <key name="vtk"> 6, </key>
+<key name="vx"> 15, </key>
 <key name="wantplanarfac"> 5, </key>
 <key name="wat"> 10, </key>
 <key name="waterdensity"> 10, </key>
 <key name="weight"> 10, </key>
 <key name="whati"> 9, </key>
 <key name="whil"> 12, </key>
-<key name="whos"> 5,9, </key>
+<key name="whos"> 9,5, </key>
 <key name="wid"> 2, </key>
-<key name="will"> 8,12,13,10, </key>
+<key name="will"> 8,12,10,13, </key>
-<key name="wir"> 14,7,5,12, </key>
+<key name="wir"> 14,12,7,5, </key>
 <key name="wirefram"> 1, </key>
 <key name="within"> 1,12, </key>
-<key name="work"> 15,3,6,12,16, </key>
+<key name="work"> 15,12,6,3,16, </key>
-<key name="x"> 3,9, </key>
+<key name="x"> 15,9,3, </key>
 <key name="x1"> 11, </key>
 <key name="x2"> 11, </key>
 <key name="xdx"> 3, </key>
@@ -690,7 +710,7 @@
 <key name="xmin"> 9, </key>
 <key name="xoy"> 15, </key>
 <key name="xyz"> 3, </key>
-<key name="y"> 3,9, </key>
+<key name="y"> 15,9,3, </key>
 <key name="y1"> 11, </key>
 <key name="y2"> 11, </key>
 <key name="ydx"> 3, </key>
@@ -699,7 +719,7 @@
 <key name="ymax"> 9, </key>
 <key name="ymin"> 9, </key>
 <key name="your"> 8,9, </key>
-<key name="z"> 3,10,9, </key>
+<key name="z"> 9,10,3, </key>
 <key name="z1"> 11, </key>
 <key name="z2"> 11, </key>
 <key name="zmax"> 9, </key>

doc/salome/gui/GEOM/whgdata/whlstf5.htm

@@ -33,13 +33,13 @@ A:hover {color:Navy; } A:hover {font-family:Tahoma; } A:hover {font-size:8pt; }
 <body marginheight="0"  marginwidth="0">
 <p class="ftsbody" align="center"><a href="whlstf4.htm" target="_self" title="previous search group"><b>&lt;&lt;</b></a><br><br></p>
 <p class="ftsbody">
-<nobr><a name="bms_VE"></a><a name="subkey_VE"></a>vector <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>4</b></a> </nobr><br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>vectors</b></a> <br><nobr>vertex <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>7</b></a> </nobr><br><a href="../files/salome2_sp3_buildgui_functions.htm"><b>vertex1</b></a> <br><a href="../files/salome2_sp3_buildgui_functions.htm"><b>vertex2</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmaxtol</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmintol</b></a> <br><nobr>vertices <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>5</b></a> </nobr><br><a name="bms_VI"></a><a name="subkey_VI"></a><a href="../files/salome2_sp3_displaygui_functions.htm"><b>view</b></a> <br><nobr>viewer <a href="../files/salome2_sp3_displaygui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>2</b></a> <a href="../changing_displaying_parameters.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_displaygui_functions.htm"><b>viewers</b></a> <br><a href="../files/salome2_sp3_displaygui_functions.htm"><b>visibility</b></a> <br><nobr>visualization <a href="../files/salome2_sp3_displaygui_functions.htm"><b>1</b></a> <a href="../changing_displaying_parameters.htm"><b>2</b></a> </nobr><br><a name="bms_VO"></a><a name="subkey_VO"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>volume</b></a> <br><a name="bms_VT"></a><a name="subkey_VT"></a><a href="../files/salome2_sp3_displaygui_functions.htm"><b>vtk</b></a> <br>
+<a name="bms_VA"></a><a name="subkey_VA"></a><a href="../files/salome2_sp3_repairgui_functions.htm"><b>val</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>valid</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>validity</b></a> <br><nobr>value <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>7</b></a> </nobr><br><nobr>values <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>6</b></a> <a href="../changing_displaying_parameters.htm"><b>7</b></a> </nobr><br><a href="../files/salome2_sp3_repairgui_functions.htm"><b>various</b></a> <br><nobr><a name="bms_VE"></a><a name="subkey_VE"></a>vector <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>5</b></a> </nobr><br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>vectors</b></a> <br><nobr>vertex <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>5</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>6</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>7</b></a> </nobr><br><a href="../files/salome2_sp3_buildgui_functions.htm"><b>vertex1</b></a> <br><a href="../files/salome2_sp3_buildgui_functions.htm"><b>vertex2</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmaxtol</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>vertexmintol</b></a> <br><nobr>vertices <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_primitivegui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>4</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>5</b></a> </nobr><br><a name="bms_VI"></a><a name="subkey_VI"></a><a href="../files/salome2_sp3_displaygui_functions.htm"><b>view</b></a> <br><nobr>viewer <a href="../files/salome2_sp3_displaygui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>2</b></a> <a href="../changing_displaying_parameters.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_displaygui_functions.htm"><b>viewers</b></a> <br><a href="../files/salome2_sp3_displaygui_functions.htm"><b>visibility</b></a> <br><nobr>visualization <a href="../files/salome2_sp3_displaygui_functions.htm"><b>1</b></a> <a href="../changing_displaying_parameters.htm"><b>2</b></a> </nobr><br><a name="bms_VO"></a><a name="subkey_VO"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>volume</b></a> <br><a name="bms_VT"></a><a name="subkey_VT"></a><a href="../files/salome2_sp3_displaygui_functions.htm"><b>vtk</b></a> <br><a name="bms_VX"></a><a name="subkey_VX"></a><a href="../sketcher.htm"><b>vx</b></a> <br>
 <br><br>
 <a name="bm_W"></a><a name="subkey_WA"></a><a href="../files/salome2_sp3_buildgui_functions.htm"><b>wantplanarface</b></a> <br><a href="../files/salome2_sp3_operationgui_functions.htm"><b>water</b></a> <br><a href="../files/salome2_sp3_operationgui_functions.htm"><b>waterdensity</b></a> <br><a name="bms_WE"></a><a name="subkey_WE"></a><a href="../files/salome2_sp3_operationgui_functions.htm"><b>weight</b></a> <br><a name="bms_WH"></a><a name="subkey_WH"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>whatis</b></a> <br><a href="../files/salome2_sp3_repairgui_functions.htm"><b>while</b></a> <br><nobr>whose <a href="../files/salome2_sp3_measuregui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>2</b></a> </nobr><br><a name="bms_WI"></a><a name="subkey_WI"></a><a href="../files/introduction_to_geom.htm"><b>wide</b></a> <br><nobr>will <a href="../files/salome2_sp3_transformationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_operationgui_functions.htm"><b>3</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>4</b></a> </nobr><br><nobr>wire <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_generationgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>3</b></a> </nobr><br><a href="../changing_displaying_parameters.htm"><b>wireframe</b></a> <br><nobr>wires <a href="../newentity_blocks.htm"><b>1</b></a> <a href="../files/salome2_sp3_repairgui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_buildgui_functions.htm"><b>3</b></a> </nobr><br><nobr>within <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../changing_displaying_parameters.htm"><b>2</b></a> </nobr><br><nobr><a name="bms_WO"></a><a name="subkey_WO"></a>work <a href="../files/salome2_sp3_repairgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_displaygui_functions.htm"><b>2</b></a> </nobr><br><nobr>working <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>2</b></a> <a href="../working_with_groups.htm"><b>3</b></a> </nobr><br>
 <br><br>
-<nobr><a name="bm_X"></a><a name="subkey_X{"></a>x <a href="../files/salome2_sp3_measuregui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>x1</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>x2</b></a> <br><a name="bms_XD"></a><a name="subkey_XD"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xdx</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xdy</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xdz</b></a> <br><a name="bms_XM"></a><a name="subkey_XM"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>xmax</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>xmin</b></a> <br><a name="bms_XO"></a><a name="subkey_XO"></a><a href="../sketcher.htm"><b>xoy</b></a> <br><a name="bms_XY"></a><a name="subkey_XY"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xyz</b></a> <br>
+<nobr><a name="bm_X"></a><a name="subkey_X{"></a>x <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>x1</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>x2</b></a> <br><a name="bms_XD"></a><a name="subkey_XD"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xdx</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xdy</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xdz</b></a> <br><a name="bms_XM"></a><a name="subkey_XM"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>xmax</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>xmin</b></a> <br><a name="bms_XO"></a><a name="subkey_XO"></a><a href="../sketcher.htm"><b>xoy</b></a> <br><a name="bms_XY"></a><a name="subkey_XY"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>xyz</b></a> <br>
 <br><br>
-<nobr><a name="bm_Y"></a><a name="subkey_Y{"></a>y <a href="../files/salome2_sp3_measuregui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>2</b></a> </nobr><br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>y1</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>y2</b></a> <br><a name="bms_YD"></a><a name="subkey_YD"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydx</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydy</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydz</b></a> <br><a name="bms_YM"></a><a name="subkey_YM"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>ymax</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>ymin</b></a> <br><nobr><a name="bms_YO"></a><a name="subkey_YO"></a>your <a href="../files/salome2_sp3_measuregui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>2</b></a> </nobr><br>
+<nobr><a name="bm_Y"></a><a name="subkey_Y{"></a>y <a href="../sketcher.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>y1</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>y2</b></a> <br><a name="bms_YD"></a><a name="subkey_YD"></a><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydx</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydy</b></a> <br><a href="../files/salome2_sp3_basicgui_functions.htm"><b>ydz</b></a> <br><a name="bms_YM"></a><a name="subkey_YM"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>ymax</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>ymin</b></a> <br><nobr><a name="bms_YO"></a><a name="subkey_YO"></a>your <a href="../files/salome2_sp3_measuregui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_geomtoolsgui_functions.htm"><b>2</b></a> </nobr><br>
 <br><br>
 <nobr><a name="bm_Z"></a><a name="subkey_Z{"></a>z <a href="../files/salome2_sp3_operationgui_functions.htm"><b>1</b></a> <a href="../files/salome2_sp3_measuregui_functions.htm"><b>2</b></a> <a href="../files/salome2_sp3_basicgui_functions.htm"><b>3</b></a> </nobr><br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>z1</b></a> <br><a href="../files/salome2_sp3_primitivegui_functions.htm"><b>z2</b></a> <br><a name="bms_ZM"></a><a name="subkey_ZM"></a><a href="../files/salome2_sp3_measuregui_functions.htm"><b>zmax</b></a> <br><a href="../files/salome2_sp3_measuregui_functions.htm"><b>zmin</b></a> <br><br><br></p>
 </body>

doc/salome/gui/GEOM/whgdata/whlstfl18.htm

@@ -37,7 +37,7 @@ body {background-color:White; }
 </head>
 <body marginheight="0"  marginwidth="0">
 
-<p class="ftsheader"><a name="subkey_V"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf4.htm#bm_V" target="ftslist" title="search letter V "><b>V </b></a> <a href="whlstf4.htm#bms_VA" target="ftslist" title="search letter VA"><b>VA</b></a> <a href="whlstf5.htm#bms_VE" target="ftslist" title="search letter VE"><b>VE</b></a> <a href="whlstf5.htm#bms_VI" target="ftslist" title="search letter VI"><b>VI</b></a> <a href="whlstf5.htm#bms_VO" target="ftslist" title="search letter VO"><b>VO</b></a> <a href="whlstf5.htm#bms_VT" target="ftslist" title="search letter VT"><b>VT</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
+<p class="ftsheader"><a name="subkey_V"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf4.htm#bm_V" target="ftslist" title="search letter V "><b>V </b></a> <a href="whlstf5.htm#bms_VA" target="ftslist" title="search letter VA"><b>VA</b></a> <a href="whlstf5.htm#bms_VE" target="ftslist" title="search letter VE"><b>VE</b></a> <a href="whlstf5.htm#bms_VI" target="ftslist" title="search letter VI"><b>VI</b></a> <a href="whlstf5.htm#bms_VO" target="ftslist" title="search letter VO"><b>VO</b></a> <a href="whlstf5.htm#bms_VT" target="ftslist" title="search letter VT"><b>VT</b></a> <a href="whlstf5.htm#bms_VX" target="ftslist" title="search letter VX"><b>VX</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
 
 </body>
 

doc/salome/gui/GEOM/whgdata/whlstfl4.htm

@@ -37,7 +37,7 @@ body {background-color:White; }
 </head>
 <body marginheight="0"  marginwidth="0">
 
-<p class="ftsheader"><a name="subkey_E"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf1.htm#bm_E" target="ftslist" title="search letter E "><b>E </b></a> <a href="whlstf1.htm#bms_ED" target="ftslist" title="search letter ED"><b>ED</b></a> <a href="whlstf1.htm#bms_EG" target="ftslist" title="search letter EG"><b>EG</b></a> <a href="whlstf1.htm#bms_EI" target="ftslist" title="search letter EI"><b>EI</b></a> <a href="whlstf1.htm#bms_EL" target="ftslist" title="search letter EL"><b>EL</b></a> <a href="whlstf1.htm#bms_EM" target="ftslist" title="search letter EM"><b>EM</b></a> <a href="whlstf1.htm#bms_EN" target="ftslist" title="search letter EN"><b>EN</b></a> <a href="whlstf1.htm#bms_ER" target="ftslist" title="search letter ER"><b>ER</b></a> <a href="whlstf1.htm#bms_ET" target="ftslist" title="search letter ET"><b>ET</b></a> <a href="whlstf1.htm#bms_EX" target="ftslist" title="search letter EX"><b>EX</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
+<p class="ftsheader"><a name="subkey_E"></a> <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a> <a href="whlstf1.htm#bm_E" target="ftslist" title="search letter E "><b>E </b></a> <a href="whlstf1.htm#bms_ED" target="ftslist" title="search letter ED"><b>ED</b></a> <a href="whlstf1.htm#bms_EG" target="ftslist" title="search letter EG"><b>EG</b></a> <a href="whlstf1.htm#bms_EI" target="ftslist" title="search letter EI"><b>EI</b></a> <a href="whlstf1.htm#bms_EL" target="ftslist" title="search letter EL"><b>EL</b></a> <a href="whlstf1.htm#bms_EM" target="ftslist" title="search letter EM"><b>EM</b></a> <a href="whlstf1.htm#bms_EN" target="ftslist" title="search letter EN"><b>EN</b></a> <a href="whlstf1.htm#bms_EQ" target="ftslist" title="search letter EQ"><b>EQ</b></a> <a href="whlstf1.htm#bms_ER" target="ftslist" title="search letter ER"><b>ER</b></a> <a href="whlstf1.htm#bms_ET" target="ftslist" title="search letter ET"><b>ET</b></a> <a href="whlstf1.htm#bms_EX" target="ftslist" title="search letter EX"><b>EX</b></a>  <a href="whnvl32.htm#home" target="_self" title="back to top level"><b>^</b></a></p>
 
 </body>
 

doc/salome/gui/GEOM/whskin_info.htm

@@ -7,9 +7,9 @@
 <body>
 <h1> WebHelp 5.00 System  Info </h1>
 <table>
-<tr><td> Start Page </td><td>geom_help.html</td></tr>
+<tr><td> Start Page </td><td>geom.html</td></tr>
 <tr><td> Skin Name </td><td>Default</td></tr>
-<tr><td> Generating Time </td><td>16:16 09/24/2004</td></tr>
+<tr><td> Generating Time </td><td>18:40 11/11/2004</td></tr>
 <tr><td> Language ID </td><td>1033</td></tr>
 <tr><td> Compile Script </td><td>webhelp5_compile_script.xml</td></tr>
 <tr><td> Compile Build Version </td><td>10.00.949</td></tr>

doc/salome/gui/GEOM/working_with_groups.htm

@@ -95,7 +95,7 @@ addButton("show",BTN_TEXT,"Show","","","","",0,0,"","","");
 
 	if (window.setRelStartPage)
 	{
-	setRelStartPage("geom_help.html");
+	setRelStartPage("geom.html");
 
 		autoSync(0);
 		sendSyncInfo();

idl/GEOM_Gen.idl

@@ -12,12 +12,11 @@
 
 module GEOM
 {
-  //-----------------------------------------------------------------//
+  /*!
-  //   Topological types for shapes (like Open Cascade types)                                                //
+   *  Topological types of shapes (like Open Cascade types)
-  //-----------------------------------------------------------------//
+   */
-
   enum shape_type { COMPOUND, COMPSOLID, SOLID, SHELL,
-	            FACE, WIRE, EDGE, VERTEX, SHAPE } ;
+	            FACE, WIRE, EDGE, VERTEX, SHAPE };
 
   typedef sequence<string>      string_array;
   typedef sequence<short>       short_array;
@@ -35,60 +34,61 @@ module GEOM
   {
 
     /*!
-     *  GetEntry() -get an entry of the object in GEOM component.
+     *  Get an entry of the object in GEOM component.
      */
     string GetEntry();
 
     /*!
-     *  GetStudyID() - get ID of study, where the object is created.
+     *  Get ID of study, where the object is created.
      */
     long GetStudyID();
 
     /*!
-     *  GetType() - get internal type of the object (POINT, BOX, CYLINDER, EXTRUSION...).
+     *  Get internal type of the object (POINT, BOX, CYLINDER, EXTRUSION...).
      */
     long GetType();
 
     /*!
-     * GetShapeType - get a <VAR>shape_type<\VAR> of the object value.
+     *  Get a <VAR>shape_type</VAR> of the object value.
      */
     shape_type GetShapeType();
 
     /*!
-     *  SetName() - set name of the object.
+     *  Set name of the object.
      *  \param theName is a name which will be associated with this object.
      */
-    void SetName(in string theName);
+    void SetName (in string theName);
 
     /*!
-     *  GetName() - get name of the object associated with this object.
+     *  Get name of the object associated with this object.
      */
     string GetName();
 
     /*!
-     *  SetStudyEntry() - set a Study entry where this object was published.
+     *  Set a Study entry where this object was published.
      */
-    void SetStudyEntry(in string theEntry);
+    void SetStudyEntry (in string theEntry);
 
     /*!
-     *  GetStudyEntry() - get a Study entry where this object was published.
+     *  Get a Study entry where this object was published.
      */
     string GetStudyEntry();
 
     /*!
-     *  GetDependency() - get a list of all GEOM objects on which were the arguments when this object was constructed and modifed.
+     *  Get a list of all GEOM objects on which were the arguments
-     *  NOTE: This method is supposed to be used by GUI only.
+     *  when this object was constructed and modified.
+     *  \note This method is supposed to be used by GUI only.
      */
     ListOfGO GetDependency();
 
     /*!
-     *  GetLastDependency() - get a list of GEOM objects on which the last function that created or modified the object depends.
+     *  Get a list of GEOM objects on which the last function that created or modified the object depends.
-     *  NOTE: This method is supposed to be used by GUI only.
+     *  \note This method is supposed to be used by GUI only.
      */
     ListOfGO GetLastDependency();
 
     /*!
-     *  getShape() get the TopoDS_Shape, for colocated case only.
+     *  Get the TopoDS_Shape, for colocated case only.
      */
     long getShape();
 
@@ -99,27 +99,32 @@ module GEOM
      */
 
     /*!
-     *  GetShapeStream() - get geometric shape of the object as a byte stream
+     *  Get geometric shape of the object as a byte stream
-     *
      */
     SALOMEDS::TMPFile GetShapeStream();
 
     /*
-     *  IsMainShape() -  returns True if this object is not a sub shape of another object.
+     *  Returns True if this object is not a sub shape of another object.
      */
     boolean IsMainShape();
 
     /*
-     * GetSubShapeIndices() - get a list of ID's of sub shapes in the main shape.
+     *  Get a list of ID's of sub shapes in the main shape.
-     * NOTE: Internal method, suppopsed to be used only by GEOM_Client
+     *  \note Internal method, suppopsed to be used only by GEOM_Client
      */
     ListOfLong GetSubShapeIndices();
 
     /*
-     * GetMainShape() - get a main shape object to which this object is a sub shape
+     *  Get a main shape object to which this object is a sub shape
-     * NOTE: Internal method, suppopsed to be used only by GEOM_Client     
+     *  \note Internal method, suppopsed to be used only by GEOM_Client
      */
     GEOM_Object GetMainShape();
+
+    /*
+     *  Return true if geom object representes a shape.
+     *  For example, method return false for GEOM_MARKER
+     */
+     boolean IsShape();
   };
 
 
@@ -129,39 +134,39 @@ module GEOM
   interface GEOM_IOperations : SALOME::GenericObj
   {
     /*!
-     *  IsDone() - to know, if the operation was successfully performed
+     *  To know, if the operation was successfully performed
      */
     boolean IsDone();
 
     /*!
-     *  SetErrorCode() - set the operation error code
+     *  Set the operation error code
      *  \param theErrorID is a string describing the error occured
-     *  NOTEL : This method is supposed to be used only by interfaces inheriting from IOperations.
+     *  \note This method is supposed to be used only by interfaces inheriting from IOperations.
      */
-    void SetErrorCode(in string theErrorID);
+    void SetErrorCode (in string theErrorID);
 
     /*!
-     *  GetErrorCode() - get the operation error code
+     *  Get the operation error code
      */
     string GetErrorCode();
 
     /*!
-     *  GetStudyID() - get ID of study, where the operation is defined
+     *  Get ID of study, where the operation is defined
      */
     long GetStudyID();
 
     /*!
-     * StartOperation () - opens a new transaction
+     *  Opens a new transaction
      */
     void StartOperation();
 
     /*!
-     *  FinishOperation() - closes the previously opened trasaction
+     *  Closes the previously opened trasaction
      */
     void FinishOperation();
 
     /*!
-     *  AbortOperation() - aborts the previously opened transaction
+     *  Aborts the previously opened transaction
      */
     void AbortOperation();
   };
@@ -221,6 +226,15 @@ module GEOM
      */
     GEOM_Object MakeVectorTwoPnt (in GEOM_Object thePnt1, in GEOM_Object thePnt2);
 
+    /*!
+     *  Create a line, passing through the given point
+     *  and parrallel to the given direction
+     *  \param thePnt Point. The resulting line will pass through it.
+     *  \param theDir Direction. The resulting line will be parallel to it.
+     *  \return New GEOM_Object, containing the created line.
+     */
+    GEOM_Object MakeLine (in GEOM_Object thePnt, in GEOM_Object theDir);
+
     /*!
      *  Create a line, passing through the given points
      *  \param thePnt1 First of two points, defining the line.
@@ -519,14 +533,14 @@ module GEOM
 				in double theFactor);
 
     /*!
-     *  PositionShape() - Modify the Location of the given object by LCS
+     *  Modify the Location of the given object by LCS
      */
     GEOM_Object PositionShape (in GEOM_Object theObject,
 			       in GEOM_Object theStartLCS,
 			       in GEOM_Object theEndLCS);
 
     /*!
-     *  PositionShapeCopy() - Modify the Location of the given object by LCS
+     *  Modify the Location of the given object by LCS
      *  creating its copy before the setting
      */
     GEOM_Object PositionShapeCopy (in GEOM_Object theObject,
@@ -713,7 +727,7 @@ module GEOM
   };
 
   /*!
-   *  GEOM_IShapesOperations: Interface for Shapes creation
+   *  GEOM_IShapesOperations: Interface for Shapes creation:
    *  Edge from two points, Wire from edges, Face from wire,
    *  Shell from faces, Solid from shells, Compound from shapes
    */
@@ -800,6 +814,14 @@ module GEOM
 			  in long        theShapeType,
 			  in boolean     isSorted);
 
+    /*!
+     *  Get a sub shape defined by its unique ID inside \a theMainShape
+     *  \note The sub shape GEOM_Objects can has ONLY ONE function.
+     *        Don't try to apply modification operations on them.
+     */
+    GEOM_Object GetSubShape (in GEOM_Object theMainShape,
+			     in long        theID);
+
     /*!
      *  Count number of faces in the given shape.
      *  \param theShape Shape to count faces in.
@@ -814,14 +836,12 @@ module GEOM
      */
     long NumberOfEdges (in GEOM_Object theShape);
 
-     /*!
+    /*!
      *  Reverses an orientation the given shape.
      *  \param theShape Shape to be reversed.
      *  \return The reversed copy of theShape.
      */
-    GEOM_Object ChangeOrientation (in GEOM_Object theShape);   
+    GEOM_Object ChangeOrientation (in GEOM_Object theShape);
-
-
   };
 
   /*!
@@ -835,27 +855,16 @@ module GEOM
      *  Creation of blocks
      */
 
-    /*!
-     *  Create a quadrangle face with specified corners.
-     *  The missing edges will be built by creating the shortest ones.
-     *  \param thePnt1,thePnt2,thePnt3,thePnt4 Corner vertices for the face.
-     *  \return New GEOM_Object, containing the created face.
-     */
-    GEOM_Object MakeQuadFaceFourVertices (in GEOM_Object thePnt1,
-					  in GEOM_Object thePnt2,
-					  in GEOM_Object thePnt3,
-					  in GEOM_Object thePnt4);
-
     /*!
      *  Create a quadrangle face from four edges. Order of Edges is not
      *  important. It is  not necessary that edges share the same vertex.
      *  \param theEdge1,theEdge2,theEdge3,theEdge4 Edges for the face bound.
      *  \return New GEOM_Object, containing the created face.
      */
-    GEOM_Object MakeQuadFaceFourEdges (in GEOM_Object theEdge1,
+    GEOM_Object MakeQuad (in GEOM_Object theEdge1,
-				       in GEOM_Object theEdge2,
+			  in GEOM_Object theEdge2,
-				       in GEOM_Object theEdge3,
+			  in GEOM_Object theEdge3,
-				       in GEOM_Object theEdge4);
+			  in GEOM_Object theEdge4);
 
     /*!
      *  Create a quadrangle face on two edges.
@@ -863,8 +872,19 @@ module GEOM
      *  \param theEdge1,theEdge2 Two opposite edges for the face.
      *  \return New GEOM_Object, containing the created face.
      */
-    GEOM_Object MakeQuadFaceTwoEdges (in GEOM_Object theEdge1,
+    GEOM_Object MakeQuad2Edges (in GEOM_Object theEdge1,
-				      in GEOM_Object theEdge2);
+				in GEOM_Object theEdge2);
+
+    /*!
+     *  Create a quadrangle face with specified corners.
+     *  The missing edges will be built by creating the shortest ones.
+     *  \param thePnt1,thePnt2,thePnt3,thePnt4 Corner vertices for the face.
+     *  \return New GEOM_Object, containing the created face.
+     */
+    GEOM_Object MakeQuad4Vertices (in GEOM_Object thePnt1,
+				   in GEOM_Object thePnt2,
+				   in GEOM_Object thePnt3,
+				   in GEOM_Object thePnt4);
 
     /*!
      *  Create a hexahedral solid, bounded by the six given faces. Order of
@@ -872,12 +892,12 @@ module GEOM
      *  \param theFace1-theFace6 Faces for the hexahedral solid.
      *  \return New GEOM_Object, containing the created solid.
      */
-    GEOM_Object MakeHexaSolidSixFaces (in GEOM_Object theFace1,
+    GEOM_Object MakeHexa (in GEOM_Object theFace1,
-				       in GEOM_Object theFace2,
+			  in GEOM_Object theFace2,
-				       in GEOM_Object theFace3,
+			  in GEOM_Object theFace3,
-				       in GEOM_Object theFace4,
+			  in GEOM_Object theFace4,
-				       in GEOM_Object theFace5,
+			  in GEOM_Object theFace5,
-				       in GEOM_Object theFace6);
+			  in GEOM_Object theFace6);
 
     /*!
      *  Create a hexahedral solid between two given faces.
@@ -885,13 +905,27 @@ module GEOM
      *  \param theFace1,theFace2 Two opposite faces for the hexahedral solid.
      *  \return New GEOM_Object, containing the created solid.
      */
-    GEOM_Object MakeHexaSolidTwoFaces (in GEOM_Object theFace1,
+    GEOM_Object MakeHexa2Faces (in GEOM_Object theFace1,
-				       in GEOM_Object theFace2);
+				in GEOM_Object theFace2);
 
     /*!
      *  Extract elements of blocks and blocks compounds
      */
 
+    /*!
+     *  Get a vertex, found in the given shape by its coordinates.
+     *  \param theShape Block or a compound of blocks.
+     *  \param theX,theY,theZ Coordinates of the sought vertex.
+     *  \param theEpsilon Maximum allowed distance between the resulting
+     *                    vertex and point with the given coordinates.
+     *  \return New GEOM_Object, containing the found vertex.
+     */
+    GEOM_Object GetPoint (in GEOM_Object theShape,
+			  in double      theX,
+			  in double      theY,
+			  in double      theZ,
+			  in double      theEpsilon);
+
     /*!
      *  Get an edge, found in the given shape by two given vertices.
      *  \param theShape Block or a compound of blocks.
@@ -902,6 +936,15 @@ module GEOM
 			 in GEOM_Object thePoint1,
 			 in GEOM_Object thePoint2);
 
+    /*!
+     *  Find an edge of the given shape, which has minimal distance to the given point.
+     *  \param theShape Block or a compound of blocks.
+     *  \param thePoint Point, close to the desired edge.
+     *  \return New GEOM_Object, containing the found edge.
+     */
+    GEOM_Object GetEdgeNearPoint (in GEOM_Object theShape,
+				  in GEOM_Object thePoint);
+
     /*!
      *  Returns a face, found in the given shape by four given corner vertices.
      *  \param theShape Block or a compound of blocks.
@@ -927,7 +970,7 @@ module GEOM
     /*!
      *  Find a face, opposite to the given one in the given block.
      *  \param theBlock Must be a hexahedral solid.
-     *  \param theFace Face of <VAR>theBlock</VAR>, opposite to the desired face.
+     *  \param theFace Face of \a theBlock, opposite to the desired face.
      *  \return New GEOM_Object, containing the found face.
      */
     GEOM_Object GetOppositeFace (in GEOM_Object theBlock,
@@ -969,6 +1012,56 @@ module GEOM
 				in long        theMaxNbFaces,
 				out long       theNbBlocks);
 
+    /*!
+     *  Enumeration of Blocks Compound defects.
+     */
+    enum BCErrorType
+    {
+      NOT_BLOCK,          /* Each element of the compound should be a Block */
+      INVALID_CONNECTION, /* A connection between two Blocks should be an entire face or an entire edge */
+      NOT_CONNECTED,      /* The compound should be connexe */
+      NOT_GLUED           /* The glue between two quadrangle faces should be applied */
+    };
+
+    /*!
+     *  Description of Blocks Compound defect: type and incriminated sub-shapes.
+     */
+    struct BCError
+    {
+      BCErrorType error;
+      ListOfLong  incriminated;
+    };
+
+    /*!
+     *  Sequence of all Blocks Compound defects.
+     */
+    typedef sequence<BCError> BCErrors;
+
+    /*!
+     *  Check, if the compound of blocks is given.
+     *  To be considered as a compound of blocks, the
+     *  given shape must satisfy the following conditions:
+     *  - Each element of the compound should be a Block (6 faces and 12 edges).
+     *  - A connection between two Blocks should be an entire quadrangle face or an entire edge.
+     *  - The compound should be connexe.
+     *  - The glue between two quadrangle faces should be applied.
+     *  \param theCompound The compound to check.
+     *  \return TRUE, if the given shape is a compound of blocks.
+     *  \return theErrors Structure, containing discovered errors and incriminated sub-shapes.
+     */
+    boolean CheckCompoundOfBlocks (in GEOM_Object theCompound,
+				   out BCErrors   theErrors);
+
+    /*!
+     *  Convert sequence of Blocks Compound errors, returned by
+     *  <VAR>CheckCompoundOfBlocks()</VAR>, into string.
+     *  \param theCompound The bad compound.
+     *  \param theErrors The sequence of \a theCompound errors.
+     *  \return String, describing all the errors in form, suitable for printing.
+     */
+    string PrintBCErrors (in GEOM_Object theCompound,
+			  in BCErrors    theErrors);
+
     /*!
      *  Get all the blocks, contained in the given compound.
      *  \param theCompound The compound to explode.
@@ -1020,7 +1113,8 @@ module GEOM
      *  \param theDirFace1 First direction face global index.
      *  \param theDirFace2 Second direction face global index.
      *  \param theNbTimes Quantity of transformations to be done.
-     *    \note Global index of sub-shape can be obtained, using method <VAR>GEOM_ILocalOperations.GetSubShapeIndex()</VAR>.
+     *    \note Global index of sub-shape can be obtained, using method
+     *          <VAR>GEOM_ILocalOperations.GetSubShapeIndex()</VAR>.
      *  \return New GEOM_Object, containing the result shape.
      */
     GEOM_Object MakeMultiTransformation1D (in GEOM_Object theBlock,
@@ -1164,9 +1258,37 @@ module GEOM
     GEOM_Object MakeSplineInterpolation (in ListOfGO thePoints);
 
     /*!
-     *  Create a wire from a list containing many points.
+     *  Create a sketcher (wire or face), following the textual description,
-     *  \param theCommand String, defining the wire in local coordinates of <VAR>theWorkingPlane</VAR>.
+     *  passed through \a theCommand argument. \n
-     *  \param theWorkingPlane Nine double values, defining origin, OZ and OX directions of the working plane.
+     *  Edges of the resulting wire or face will be arcs of circles and/or linear segments. \n
+     *  Format of the description string have to be the following:
+     *
+     *  "Sketcher[:F x1 y1]:CMD[:CMD[:CMD...]]"
+     *
+     *  Where:
+     *  - x1, y1 are coordinates of the first sketcher point (zero by default),
+     *  - CMD is one of
+     *     - "R angle" : Set the direction by angle
+     *     - "D dx dy" : Set the direction by DX & DY
+     *     .
+     *       \n
+     *     - "TT x y" : Create segment by point at X & Y
+     *     - "T dx dy" : Create segment by point with DX & DY
+     *     - "L length" : Create segment by direction & Length
+     *     - "IX x" : Create segment by direction & Intersect. X
+     *     - "IY y" : Create segment by direction & Intersect. Y
+     *     .
+     *       \n
+     *     - "C radius length" : Create arc by direction, radius and length(in degree)
+     *     .
+     *       \n
+     *     - "WW" : Close Wire (to finish)
+     *     - "WF" : Close Wire and build face (to finish)
+     *
+     *  \param theCommand String, defining the sketcher in local
+     *                    coordinates of the working plane.
+     *  \param theWorkingPlane Nine double values, defining origin,
+     *                         OZ and OX directions of the working plane.
      *  \return New GEOM_Object, containing the created wire.
      */
     GEOM_Object MakeSketcher (in string theCommand, in ListOfDouble theWorkingPlane);
@@ -1223,9 +1345,9 @@ module GEOM
      *  Perform a chamfer on edges, common to the specified faces.
      *  with distance D1 on the Face1
      *  \param theShape Shape, to perform chamfer on.
-     *  \param theD1 Chamfer size along <VAR>theFace1</VAR>.
+     *  \param theD1 Chamfer size along \a theFace1.
-     *  \param theD2 Chamfer size along <VAR>theFace2</VAR>.
+     *  \param theD2 Chamfer size along \a theFace2.
-     *  \param theFace1,theFace2 Global indices of two faces of <VAR>theShape</VAR>.
+     *  \param theFace1,theFace2 Global indices of two faces of \a theShape.
      *    \note Global index of sub-shape can be obtained, using method <VAR>GetSubShapeIndex()</VAR>.
      *  \return New GEOM_Object, containing the result shape.
      */
@@ -1237,11 +1359,11 @@ module GEOM
      *  Perform a chamfer on all edges of the specified faces.
      *  with distance D1 on the first specified face (if several for one edge)
      *  \param theShape Shape, to perform chamfer on.
-     *  \param theD1 Chamfer size along face from <VAR>theFaces</VAR>. If both faces,
+     *  \param theD1 Chamfer size along face from \a theFaces. If both faces,
-     *               connected to the edge, are in <VAR>theFaces</VAR>, <VAR>theD1</VAR>
+     *               connected to the edge, are in \a theFaces, \a theD1
-     *               will be get along face, which is nearer to <VAR>theFaces</VAR> beginning.
+     *               will be get along face, which is nearer to \a theFaces beginning.
      *  \param theD2 Chamfer size along another of two faces, connected to the edge.
-     *  \param theFaces Sequence of global indices of faces of <VAR>theShape</VAR>.
+     *  \param theFaces Sequence of global indices of faces of \a theShape.
      *    \note Global index of sub-shape can be obtained, using method <VAR>GetSubShapeIndex()</VAR>.
      *  \return New GEOM_Object, containing the result shape.
      */
@@ -1256,7 +1378,8 @@ module GEOM
      *  \param theWeight Weight og the shape.
      *  \param theWaterDensity Density of the water.
      *  \param theMeshDeflection Deflection od the mesh, using to compute the section.
-     *  \return New GEOM_Object, containing a section of <VAR>theShape</VAR> by a plane, corresponding to water level.
+     *  \return New GEOM_Object, containing a section of \a theShape
+     *          by a plane, corresponding to water level.
      */
     GEOM_Object MakeArchimede (in GEOM_Object theShape,
 			       in double theWeight,
@@ -1264,10 +1387,10 @@ module GEOM
 			       in double theMeshDeflection);
 
     /*!
-     *  Get global index of <VAR>theSubShape</VAR> in <VAR>theShape</VAR>.
+     *  Get global index of \a theSubShape in \a theShape.
      *  \param theShape Main shape.
      *  \param theSubShape Sub-shape of the main shape.
-     *  \return global index of <VAR>theSubShape</VAR> in <VAR>theShape</VAR>.
+     *  \return global index of \a theSubShape in \a theShape.
      */
     long GetSubShapeIndex (in GEOM_Object theShape, in GEOM_Object theSubShape);
   };
@@ -1285,7 +1408,7 @@ module GEOM
      *  \param theParameters List of names of parameters
      *                    ("FixShape.Tolerance3d", "SplitClosedFaces.NbSplitPoints", etc.).
      *  \param theValues List of values of parameters, in the same order
-     *                    as parameters are listed in <VAR>theParameters</VAR> list.
+     *                    as parameters are listed in \a theParameters list.
      *  \return New GEOM_Object, containing processed shape.
      */
     GEOM_Object ProcessShape (in GEOM_Object theShapes,
@@ -1300,7 +1423,7 @@ module GEOM
      *  \param theOperators Output. Default list of names of operators.
      *  \param theParameters Output. Default list of names of parameters.
      *  \param theValues Output. List of default values of parameters, in the same order
-     *                           as parameters are listed in <VAR>theParameters</VAR> list.
+     *                           as parameters are listed in \a theParameters list.
      */
     void GetShapeProcessParameters (out string_array theOperators,
 				    out string_array theParameters,
@@ -1358,9 +1481,10 @@ module GEOM
      *  \param theObject Shape to be processed.
      *  \param theEdgeIndex Index of edge to be divided within theObject's shape,
      *                      if -1, then theObject itself is the edge.
-     *  \param theValue Value of parameter on edge or length parameter, depending on <VAR>isByParameter</VAR>.
+     *  \param theValue Value of parameter on edge or length parameter,
-     *  \param isByParameter If TRUE : <VAR>theValue</VAR> is treated as a curve parameter [0..1],
+     *                  depending on \a isByParameter.
-     *                       if FALSE : <VAR>theValue</VAR> is treated as a length parameter [0..1]
+     *  \param isByParameter If TRUE : \a theValue is treated as a curve parameter [0..1],
+     *                       if FALSE : \a theValue is treated as a length parameter [0..1]
      *  \return New GEOM_Object, containing processed shape.
      */
     GEOM_Object DivideEdge (in GEOM_Object theObject, in short theEdgeIndex,
@@ -1386,7 +1510,7 @@ module GEOM
   interface GEOM_IInsertOperations : GEOM_IOperations
   {
     /*!
-     *  MakeCopy() - create a copy of the given object
+     *  Create a copy of the given object
      */
     GEOM_Object MakeCopy (in GEOM_Object theOriginal);
 
@@ -1526,7 +1650,7 @@ module GEOM
     /*!
      *  Get point coordinates
      */
-    void  PointCoordinates( in GEOM_Object theShape, out double X, out double Y, out double Z );
+    void PointCoordinates (in GEOM_Object theShape, out double X, out double Y, out double Z);
   };
 
 
@@ -1536,7 +1660,7 @@ module GEOM
   interface GEOM_IGroupOperations : GEOM_IOperations
   {
     /*!
-     *  CreateGroup() - creates a new group which will store  sub shapes of theMainShape 
+     *  Creates a new group which will store  sub shapes of theMainShape
      *  \param theMainShape is a GEOM object on which the group is selected
      *  \param theShapeType defines a shape type of the group
      *  \return a newly created GEOM group
@@ -1544,37 +1668,39 @@ module GEOM
     GEOM_Object CreateGroup (in GEOM_Object theMainShape, in long theShapeType);
 
     /*!
-     *  AddObject() - adds a sub object with ID theSubShapeId to the group
+     *  Adds a sub object with ID theSubShapeId to the group
      *  \param theGroup is a GEOM group to which the new sub shape is added
-     *  \param theSubShapeId is a sub shape ID in the main object. Use method GetSubShapeIndex of ILocalOperations to get an ID by the sub shape
+     *  \param theSubShapeId is a sub shape ID in the main object.
+     *  \note Use method <VAR>ILocalOperations.GetSubShapeIndex()</VAR> to get an ID by the sub shape
      */
     void AddObject (in GEOM_Object theGroup, in long theSubShapeId);
 
     /*!
-     *  RemoveObject() - removes a sub object with ID theSubShapeId from the group
+     *  Removes a sub object with ID \a theSubShapeId from the group
      *  \param theGroup is a GEOM group from which the new sub shape is removed
-     *  \param theSubShapeId is a sub shape ID in the main object. Use method GetSubShapeIndex of ILocalOperations to get an ID by the sub shape
+     *  \param theSubShapeId is a sub shape ID in the main object.
+     *  \note Use method <VAR>ILocalOperations.GetSubShapeIndex()</VAR> to get an ID by the sub shape
      */
     void RemoveObject (in GEOM_Object theGroup, in long theSubShapeId);
 
     /*!
-     *  GetType() - returns a type of sub objects stored in the group
+     *  Returns a type of sub objects stored in the group
      *  \param theGroup is a GEOM group which type is returned.
      */
     long GetType (in GEOM_Object theGroup);
 
     /*!
-     *  GetMainShape() - returns a main shape associated with the group
+     *  Returns a main shape associated with the group
      *  \param theGroup is a GEOM group for which a main shape object is requested
      *  \return a GEOM object which is a main shape for theGroup
      */
-    GEOM_Object  GetMainShape(in GEOM_Object theGroup);
+    GEOM_Object GetMainShape (in GEOM_Object theGroup);
 
     /*!
-     *  GetObjects() - returns a list of sub objects ID stored in the group
+     *  Returns a list of sub objects ID stored in the group
      *  \param theGroup is a GEOM group for which a list of IDs is requested
      */
-    ListOfLong  GetObjects(in GEOM_Object theGroup);
+    ListOfLong GetObjects (in GEOM_Object theGroup);
   };
 
 
@@ -1584,22 +1710,24 @@ module GEOM
    */
   interface GEOM_Gen : Engines::Component,SALOMEDS::Driver
   {
-    typedef sequence<GEOM_Object> ListOfGeomShapes;
+    /*!
-
-     /*!
      *  Undo/Redo Management
      */
 
-    void Undo(in long theStudyID);
+    void Undo (in long theStudyID);
 
-    void Redo(in long theStudyID);
+    void Redo (in long theStudyID);
 
     /*!
      * Publishing manangement
-     * Adds in theStudy a object theObject under with a name theName, if theFather is not NULL the object is placed under thFather's SObject.
+     * Adds in theStudy a object theObject under with a name theName,
+     * if theFather is not NULL the object is placed under thFather's SObject.
      * Returns a SObject where theObject is placed
      */
-    SALOMEDS::SObject AddInStudy(in SALOMEDS::Study theStudy, in GEOM_Object theObject, in string theName, in GEOM_Object theFather);
+    SALOMEDS::SObject AddInStudy (in SALOMEDS::Study theStudy,
+				  in GEOM_Object theObject,
+				  in string theName,
+				  in GEOM_Object theFather);
 
     /*!
      *  Methods to access interfaces for objects creation and transformation
@@ -1615,47 +1743,49 @@ module GEOM
     GEOM_IInsertOperations    GetIInsertOperations   (in long theStudyID) raises (SALOME::SALOME_Exception);
     GEOM_IMeasureOperations   GetIMeasureOperations  (in long theStudyID) raises (SALOME::SALOME_Exception);
     GEOM_IBlocksOperations    GetIBlocksOperations   (in long theStudyID) raises (SALOME::SALOME_Exception);
-    GEOM_IGroupOperations    GetIGroupOperations   (in long theStudyID) raises (SALOME::SALOME_Exception);
+    GEOM_IGroupOperations     GetIGroupOperations    (in long theStudyID) raises (SALOME::SALOME_Exception);
 
     /*!
-     *  Objects Management 
+     *  Objects Management
      */
-    
+
     /*!
-     *  RemoveObject() - removes the object from the GEOM component
+     *  Removes the object from the GEOM component
      *  \param theObject is a GEOM object to be removed
      */
     void RemoveObject (in GEOM_Object theObject);
-    
+
     /*!
-     *  GetObject() - returns an object defined by the study and its entry in the GEOM component
+     *  Returns an object defined by the study and its entry in the GEOM component
-     *  \param theStudyID is a SALOMEDS Study ID 
+     *  \param theStudyID is a SALOMEDS Study ID
      *  \param theEntry is an entry of the requested GEOM object in the GEOM component
-     *  NOTE: if the object has not previously been created a NULL GEOM object is returned
+     *  \note if the object has not previously been created a NULL GEOM object is returned
      */
     GEOM_Object GetObject (in long theStudyID, in string theEntry);
 
     /*!
-     * AddSubShape() - add a sub shape defined by indices in theIndices (contains unique IDs of sub shapes inside theMainShape)
+     *  Add a sub shape defined by indices in \a theIndices
-     *  NOTE: The sub shape GEOM_Objects can has ONLY ONE  function. Don't try to apply modification operations on them.
+     *  (contains unique IDs of sub shapes inside theMainShape)
-     *  NOTE: Internal method
+     *  \note The sub shape GEOM_Objects can has ONLY ONE function.
+     *        Don't try to apply modification operations on them.
+     *  \note Internal method
      */
-    GEOM_Object AddSubShape(in GEOM_Object theMainShape, in ListOfLong theIndices);
+    GEOM_Object AddSubShape (in GEOM_Object theMainShape, in ListOfLong theIndices);
 
     /*!
      *  GEOM object's IOR Management
      */
 
     /*!
-     *  GetIORFromString() - returns a GEOM Object defined by its IOR
+     *  Returns a GEOM Object defined by its IOR
      *  \param theIOR a string containg an IOR of the requested GEOM object
-     */   
+     */
     GEOM_Object GetIORFromString (in string theIOR);
 
     /*!
-     *  GetStringFromIOR() - returns a string which contains an IOR of the GEOM object
+     *  Returns a string which contains an IOR of the GEOM object
      *  \param theObject is a GEOM object which IOR is requested
-     */     
+     */
     string GetStringFromIOR (in GEOM_Object theObject);
   };
 };

idl/GEOM_Superv.idl

@@ -0,0 +1,375 @@
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : GEOM_Superv.idl
+//  Author : Lucien PIGNOLONI
+
+#ifndef __GEOM_SUPERV__
+#define __GEOM_SUPERV__
+
+#include "GEOM_Gen.idl"
+
+module GEOM
+{
+  interface GEOM_Superv : Engines::Component,SALOMEDS::Driver
+  {
+    //-----------------------------------------------------------//
+    // Set current study ID                                      // 
+    //-----------------------------------------------------------//
+    void SetStudyID (in long theStudyID) ;
+    
+    //-----------------------------------------------------------//
+    // Primitives Construction : BasicOperations                 // 
+    //-----------------------------------------------------------//
+    GEOM_Object MakePointXYZ (in double theX,
+			      in double theY,
+			      in double theZ) ;
+    GEOM_Object MakePointWithReference (in GEOM_Object theReference,
+					in double theX, 
+					in double theY, 
+					in double theZ) ;
+    GEOM_Object MakePointOnCurve (in GEOM_Object theRefCurve,
+				  in double theParameter) ;
+    GEOM_Object MakeVectorDXDYDZ (in double theDX,
+				  in double theDY,
+				  in double theDZ) ;
+    GEOM_Object MakeVectorTwoPnt (in GEOM_Object thePnt1,
+				  in GEOM_Object thePnt2) ;
+    GEOM_Object MakeLineTwoPnt (in GEOM_Object thePnt1,
+				in GEOM_Object thePnt2) ;
+    GEOM_Object MakePlaneThreePnt (in GEOM_Object thePnt1,
+				   in GEOM_Object thePnt2,
+				   in GEOM_Object thePnt3,
+				   in double theTrimSize) ;
+    GEOM_Object MakePlanePntVec (in GEOM_Object thePnt,
+				 in GEOM_Object theVec,
+				 in double theTrimSize) ;
+    GEOM_Object MakePlaneFace (in GEOM_Object theFace,
+			       in double theTrimSize) ;
+    GEOM_Object MakeMarker (in double theOX , in double theOY , in double theOZ,
+			    in double theXDX, in double theXDY, in double theXDZ,
+			    in double theYDX, in double theYDY, in double theYDZ) ;
+
+    //-----------------------------------------------------------//
+    // Primitives Construction : 3DPrimOperations                //
+    //-----------------------------------------------------------//
+    GEOM_Object MakeBox (in double theX1,
+			 in double theY1,
+			 in double theZ1,
+			 in double theX2,
+			 in double theY2,
+			 in double theZ2) ; 
+    GEOM_Object MakeBoxDXDYDZ (in double theDX, 
+			       in double theDY, 
+			       in double theDZ) ;
+    GEOM_Object MakeBoxTwoPnt (in GEOM_Object thePnt1, 
+			       in GEOM_Object thePnt2) ;
+    GEOM_Object MakeCylinderPntVecRH (in GEOM_Object thePnt,
+				      in GEOM_Object theAxis,
+				      in double theRadius,
+				      in double theHeight) ;
+    GEOM_Object MakeCylinderRH (in double theR, 
+				in double theH) ;
+    GEOM_Object MakeSphere (in double theX,
+			    in double theY,
+			    in double theZ,
+			    in double theRadius) ;
+    GEOM_Object MakeSphereR (in double theR) ;
+    GEOM_Object MakeSpherePntR (in GEOM_Object thePnt, 
+				in double theR) ;
+    GEOM_Object MakeTorusPntVecRR (in GEOM_Object thePnt,
+				   in GEOM_Object theVec,
+				   in double theRMajor,
+				   in double theRMinor) ;
+    GEOM_Object MakeTorusRR (in double theRMajor,
+			     in double theRMinor) ;
+    GEOM_Object MakeConePntVecR1R2H (in GEOM_Object thePnt,
+				     in GEOM_Object theAxis,
+				     in double theR1,
+				     in double theR2,
+				     in double theHeight) ;
+    GEOM_Object MakeConeR1R2H (in double theR1, 
+			       in double theR2, 
+			       in double theHeight) ;
+    GEOM_Object MakePrismVecH (in GEOM_Object theBase,
+			       in GEOM_Object theVec,
+			       in double      theH) ;
+    GEOM_Object MakePrismTwoPnt (in GEOM_Object theBase,
+				 in GEOM_Object thePoint1,
+				 in GEOM_Object thePoint2) ;
+    GEOM_Object MakePipe (in GEOM_Object theBase, 
+			  in GEOM_Object thePath) ;
+    GEOM_Object MakeRevolutionAxisAngle (in GEOM_Object theBase,
+					 in GEOM_Object theAxis,
+					 in double theAngle) ;
+    GEOM_Object MakeFilling (in GEOM_Object theShape,
+			     in long theMinDeg, in long theMaxDeg,
+			     in double theTol2D, in double theTol3D,
+			     in long theNbIter) ;
+
+    //-----------------------------------------------------------//
+    // BooleanOperations                                         //
+    //-----------------------------------------------------------//
+    GEOM_Object MakeBoolean (in GEOM_Object theShape1,
+			     in GEOM_Object theShape2,
+			     in long theOperation) ;
+    GEOM_Object MakeFuse (in GEOM_Object theShape1,
+			  in GEOM_Object theShape2) ;
+    GEOM_Object MakePartition (in ListOfGO   theShapes,
+			       in ListOfGO   theTools,
+			       in ListOfGO   theKeepInside,
+			       in ListOfGO   theRemoveInside,
+			       in short      theLimit,
+			       in boolean    theRemoveWebs,
+			       in ListOfLong theMaterials) ;
+    GEOM_Object MakeHalfPartition (in GEOM_Object theShape,
+				   in GEOM_Object thePlane) ;
+
+    //-----------------------------------------------------------//
+    // InsertOperations                                          //
+    //-----------------------------------------------------------//
+    GEOM_Object MakeCopy (in GEOM_Object theOriginal) ;
+    void Export (in GEOM_Object theObject, in string theFileName, in string theFormatName) ;
+    GEOM_Object Import (in string theFileName, in string theFormatName) ;
+    void ImportTranslators (out string_array theFormats,
+			    out string_array thePatterns) ;
+    void ExportTranslators (out string_array theFormats,
+			    out string_array thePatterns) ;
+
+    //-----------------------------------------------------------//
+    // TransformOperations                                       //
+    //-----------------------------------------------------------//
+    GEOM_Object TranslateTwoPoints (in GEOM_Object theObject,
+				    in GEOM_Object thePoint1,
+				    in GEOM_Object thePoint2) ;
+    GEOM_Object TranslateTwoPointsCopy (in GEOM_Object theObject,
+					in GEOM_Object thePoint1,
+                                        in GEOM_Object thePoint2) ;
+    GEOM_Object TranslateDXDYDZ (in GEOM_Object theObject,
+				 in double theDX, 
+				 in double theDY, 
+				 in double theDZ) ;
+    GEOM_Object TranslateDXDYDZCopy (in GEOM_Object theObject,
+				     in double theDX, 
+				     in double theDY, 
+				     in double theDZ) ;
+    GEOM_Object TranslateVector (in GEOM_Object theObject,
+				 in GEOM_Object theVector) ;
+    GEOM_Object TranslateVectorCopy (in GEOM_Object theObject,
+				     in GEOM_Object theVector) ;
+    GEOM_Object MultiTranslate1D (in GEOM_Object theObject,
+				  in GEOM_Object theVector,
+				  in double theStep,
+				  in long theNbTimes) ;
+    GEOM_Object MultiTranslate2D (in GEOM_Object theObject,
+				  in GEOM_Object theVector1,
+				  in double theStep1,
+				  in long theNbTimes1,
+				  in GEOM_Object theVector2,
+				  in double theStep2,
+				  in long theNbTimes2) ;
+    GEOM_Object Rotate (in GEOM_Object theObject,
+			in GEOM_Object theAxis,
+			in double theAngle) ;
+    GEOM_Object RotateCopy (in GEOM_Object theObject,
+			    in GEOM_Object theAxis,
+			    in double theAngle) ;
+    GEOM_Object MultiRotate1D (in GEOM_Object theObject,
+			       in GEOM_Object theAxis,
+			       in long theNbTimes) ;
+    GEOM_Object MultiRotate2D (in GEOM_Object theObject,
+			       in GEOM_Object theAxis,
+			       in double theAngle,
+			       in long theNbTimes1,
+			       in double theStep,
+			       in long theNbTimes2) ;
+    GEOM_Object MirrorPlane (in GEOM_Object theObject, in GEOM_Object thePlane) ;
+    GEOM_Object MirrorPlaneCopy (in GEOM_Object theObject, in GEOM_Object thePlane) ;
+    GEOM_Object MirrorAxis (in GEOM_Object theObject, in GEOM_Object theAxis) ;
+    GEOM_Object MirrorAxisCopy (in GEOM_Object theObject, in GEOM_Object theAxis) ;
+    GEOM_Object MirrorPoint (in GEOM_Object theObject, in GEOM_Object thePoint) ;
+    GEOM_Object MirrorPointCopy (in GEOM_Object theObject, in GEOM_Object thePoint) ;
+    GEOM_Object OffsetShape (in GEOM_Object theObject, in double theOffset) ;
+    GEOM_Object OffsetShapeCopy (in GEOM_Object theObject, in double theOffset) ;
+    GEOM_Object ScaleShape (in GEOM_Object theObject, in GEOM_Object thePoint,
+			    in double theFactor) ;
+    GEOM_Object ScaleShapeCopy (in GEOM_Object theObject, in GEOM_Object thePoint,
+				in double theFactor) ;
+    GEOM_Object PositionShape (in GEOM_Object theObject,
+			       in GEOM_Object theStartLCS,
+			       in GEOM_Object theEndLCS) ;
+    GEOM_Object PositionShapeCopy (in GEOM_Object theObject,
+				   in GEOM_Object theStartLCS,
+				   in GEOM_Object theEndLCS) ;
+
+    //-----------------------------------------------------------//
+    // ShapesOperations                                          //
+    //-----------------------------------------------------------//
+    GEOM_Object MakeEdge (in GEOM_Object thePnt1, in GEOM_Object thePnt2) ;
+    GEOM_Object MakeWire (in ListOfGO theEdgesAndWires) ;
+    GEOM_Object MakeFace (in GEOM_Object theWire, in boolean isPlanarWanted) ;
+    GEOM_Object MakeFaceWires (in ListOfGO theWires, in boolean isPlanarWanted) ;
+    GEOM_Object MakeShell (in ListOfGO theFacesAndShells) ;
+    GEOM_Object MakeSolidShell (in GEOM_Object theShell) ;
+    GEOM_Object MakeSolidShells (in ListOfGO theShells) ;
+    GEOM_Object MakeCompound (in ListOfGO theShapes) ;
+    GEOM_Object MakeGlueFaces (in GEOM_Object theShape, in double theTolerance) ;
+    ListOfGO MakeExplode (in GEOM_Object theShape,
+			  in long        theShapeType,
+			  in boolean     isSorted) ;
+    long NumberOfFaces (in GEOM_Object theShape) ;
+    long NumberOfEdges (in GEOM_Object theShape) ;
+    GEOM_Object ChangeOrientation (in GEOM_Object theShape) ;
+
+    //-----------------------------------------------------------//
+    // BlocksOperations                                          //
+    //-----------------------------------------------------------//
+    GEOM_Object MakeQuad4Vertices (in GEOM_Object thePnt1,
+				   in GEOM_Object thePnt2,
+				   in GEOM_Object thePnt3,
+				   in GEOM_Object thePnt4) ;
+    GEOM_Object MakeQuad (in GEOM_Object theEdge1,
+			  in GEOM_Object theEdge2,
+			  in GEOM_Object theEdge3,
+			  in GEOM_Object theEdge4) ;
+    GEOM_Object MakeQuad2Edges (in GEOM_Object theEdge1,
+				in GEOM_Object theEdge2) ;
+    GEOM_Object MakeHexa (in GEOM_Object theFace1,
+			  in GEOM_Object theFace2,
+			  in GEOM_Object theFace3,
+			  in GEOM_Object theFace4,
+			  in GEOM_Object theFace5,
+			  in GEOM_Object theFace6) ;
+    GEOM_Object MakeHexa2Faces (in GEOM_Object theFace1,
+				in GEOM_Object theFace2) ;
+    GEOM_Object GetPoint (in GEOM_Object theShape,
+			  in double      theX,
+			  in double      theY,
+			  in double      theZ,
+			  in double      theEpsilon) ;
+    GEOM_Object GetEdge (in GEOM_Object theShape,
+			 in GEOM_Object thePoint1,
+			 in GEOM_Object thePoint2) ;
+    GEOM_Object GetEdgeNearPoint (in GEOM_Object theShape,
+				  in GEOM_Object thePoint) ;
+    GEOM_Object GetFaceByPoints (in GEOM_Object theShape,
+				 in GEOM_Object thePoint1,
+				 in GEOM_Object thePoint2,
+				 in GEOM_Object thePoint3,
+				 in GEOM_Object thePoint4) ;
+    GEOM_Object GetFaceByEdges (in GEOM_Object theShape,
+				in GEOM_Object theEdge1,
+				in GEOM_Object theEdge2) ;
+    GEOM_Object GetOppositeFace (in GEOM_Object theBlock,
+				 in GEOM_Object theFace) ;
+    GEOM_Object GetFaceNearPoint (in GEOM_Object theShape,
+				  in GEOM_Object thePoint) ;
+    GEOM_Object GetFaceByNormale (in GEOM_Object theBlock,
+				  in GEOM_Object theVector) ;
+    boolean IsCompoundOfBlocks (in GEOM_Object theCompound,
+				in long        theMinNbFaces,
+				in long        theMaxNbFaces,
+				out long       theNbBlocks) ;
+    boolean CheckCompoundOfBlocks (in GEOM_Object theCompound,
+				   out GEOM_IBlocksOperations::BCErrors   theErrors) ;
+    string PrintBCErrors (in GEOM_Object theCompound,
+			  in GEOM_IBlocksOperations::BCErrors    theErrors) ;
+    ListOfGO ExplodeCompoundOfBlocks (in GEOM_Object theCompound,
+				      in long        theMinNbFaces,
+				      in long        theMaxNbFaces) ;
+    GEOM_Object GetBlockNearPoint (in GEOM_Object theCompound,
+				   in GEOM_Object thePoint) ;
+    GEOM_Object GetBlockByParts (in GEOM_Object theCompound,
+				 in ListOfGO    theParts) ;
+    ListOfGO GetBlocksByParts (in GEOM_Object theCompound,
+			       in ListOfGO    theParts) ;
+    GEOM_Object MakeMultiTransformation1D (in GEOM_Object theBlock,
+					   in long        theDirFace1,
+					   in long        theDirFace2,
+					   in long        theNbTimes) ;
+    GEOM_Object MakeMultiTransformation2D (in GEOM_Object theBlock,
+					   in long        theDirFace1U,
+					   in long        theDirFace2U,
+					   in long        theNbTimesU,
+					   in long        theDirFace1V,
+					   in long        theDirFace2V,
+					   in long        theNbTimesV) ;
+
+    //-----------------------------------------------------------//
+    // CurvesOperations                                          //
+    //-----------------------------------------------------------//
+    GEOM_Object MakeCirclePntVecR (in GEOM_Object thePnt,
+				   in GEOM_Object theVec,
+				   in double theR) ;
+    GEOM_Object MakeCircleThreePnt (in GEOM_Object thePnt1,
+				    in GEOM_Object thePnt2,
+				    in GEOM_Object thePnt3) ;
+    GEOM_Object MakeEllipse (in GEOM_Object thePnt,
+			     in GEOM_Object theVec,
+			     in double theRMajor,
+			     in double theRMinor) ;
+    GEOM_Object MakeArc (in GEOM_Object thePnt1,
+			 in GEOM_Object thePnt2,
+			 in GEOM_Object thePnt3) ;
+    GEOM_Object MakePolyline (in ListOfGO thePoints) ;
+    GEOM_Object MakeSplineBezier (in ListOfGO thePoints) ;
+    GEOM_Object MakeSplineInterpolation (in ListOfGO thePoints) ;
+    GEOM_Object MakeSketcher (in string theCommand, in ListOfDouble theWorkingPlane) ;
+    
+    //-----------------------------------------------------------//
+    // LocalOperations                                           //
+    //-----------------------------------------------------------//
+    GEOM_Object MakeFilletAll (in GEOM_Object theShape,
+			       in double      theR) ;
+    GEOM_Object MakeFilletEdges (in GEOM_Object theShape,
+				 in double      theR,
+				 in ListOfLong  theEdges) ;
+    GEOM_Object MakeFilletFaces (in GEOM_Object theShape,
+				 in double      theR,
+				 in ListOfLong  theFaces) ;
+    GEOM_Object MakeChamferAll (in GEOM_Object theShape,
+				in double      theD) ;
+    GEOM_Object MakeChamferEdge (in GEOM_Object theShape,
+				 in double theD1, in double theD2,
+				 in long theFace1, in long theFace2) ;
+    GEOM_Object MakeChamferFaces (in GEOM_Object theShape,
+				  in double theD1, in double theD2,
+				  in ListOfLong theFaces) ;
+    GEOM_Object MakeArchimede (in GEOM_Object theShape,
+			       in double theWeight,
+			       in double theWaterDensity,
+			       in double theMeshDeflection) ;
+    long GetSubShapeIndex (in GEOM_Object theShape, in GEOM_Object theSubShape) ;
+
+    //-----------------------------------------------------------//
+    // GroupOperations                                           //
+    //-----------------------------------------------------------//
+    GEOM_Object CreateGroup (in GEOM_Object theMainShape, in long theShapeType) ;
+    void AddObject (in GEOM_Object theGroup, in long theSubShapeId) ;
+    void RemoveObject (in GEOM_Object theGroup, in long theSubShapeId) ;
+    long GetType (in GEOM_Object theGroup) ;
+    GEOM_Object  GetMainShape(in GEOM_Object theGroup) ;
+    ListOfLong  GetObjects(in GEOM_Object theGroup) ;
+
+  };
+};
+
+#endif

idl/Makefile.in

@@ -11,7 +11,8 @@ VPATH=.:${KERNEL_ROOT_DIR}/idl/salome
 @COMMENCE@
 
 IDL_FILES = \
-  GEOM_Gen.idl
+  GEOM_Gen.idl \
+  GEOM_Superv.idl
 
 PY_CLIENT_IDL = $(IDL_FILES)
 

resources/GEOM_en.xml

@@ -141,6 +141,7 @@
    <popup-item item-id="607" pos-id="" label-id="Suppress internal wires" icon-id="suppressintwires.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    <popup-item item-id="604" pos-id="" label-id="Suppress holes" icon-id="supresshole.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    <popup-item item-id="601" pos-id="" label-id="Sewing" icon-id="sewing.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
+   <popup-item item-id="602" pos-id="" label-id="Glue faces" icon-id="glue.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    <popup-item item-id="608" pos-id="" label-id="Add point on edge" icon-id="pointonedge.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
    <popup-item item-id="609" pos-id="" label-id="Check free boundaries" icon-id="free_bound.png" tooltip-id="" accel-id="" toggle-id="" execute-action=""/>
 </menu-item>

src/BasicGUI/BasicGUI.cxx

@@ -33,6 +33,8 @@ using namespace std;
 #include "QAD_RightFrame.h"
 #include "QAD_Desktop.h"
 #include "OCCViewer_Viewer3d.h"
+#include "OCCViewer_ViewFrame.h"
+#include "OCCViewer_AISSelector.h"
 #include "OCCViewer_ViewPort3d.h"
 #include "SALOMEGUI_QtCatchCorbaException.hxx"
 

src/BasicGUI/BasicGUI_CircleDlg.cxx

@@ -307,6 +307,7 @@ void BasicGUI_CircleDlg::LineEditReturnPressed()
 void BasicGUI_CircleDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  globalSelection( GEOM_POINT );
   connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
   myGeomGUI->SetState( 0 );

src/BasicGUI/BasicGUI_MarkerDlg.cxx

@@ -236,7 +236,7 @@ void BasicGUI_MarkerDlg::ConstructorsClicked( int constructorId )
 	resize(0, 0);
 	Group1->show();
 
-	globalSelection();
+	globalSelection( GEOM_ALLGEOM );
 	myEditCurrentArgument = Group1->LineEdit1;
 	Group1->LineEdit1->setText("");
 	break;
@@ -505,7 +505,7 @@ void BasicGUI_MarkerDlg::SetEditCurrentArgument()
   
   if(send == Group1->PushButton1) {
     myEditCurrentArgument = Group1->LineEdit1;
-    globalSelection();
+    globalSelection( GEOM_ALLGEOM );
   }
   else if(send == Group2->PushButton1) {
     myEditCurrentArgument = Group2->LineEdit1;
@@ -582,7 +582,22 @@ GEOM::GEOM_IOperations_ptr BasicGUI_MarkerDlg::createOperation()
 //=================================================================================
 bool BasicGUI_MarkerDlg::isValid( QString& msg )
 {
-  return true;
+  const int id = getConstructorId();
+  gp_Vec v1( myData[ DX1 ]->GetValue(), myData[ DY1 ]->GetValue(), myData[ DZ1 ]->GetValue() ),
+         v2( myData[ DX2 ]->GetValue(), myData[ DY2 ]->GetValue(), myData[ DZ2 ]->GetValue() );
+  bool isOrthogonal = v1.IsNormal( v2, Precision::Confusion() );
+  switch ( id )
+  {
+    case 0:
+      return isOrthogonal;
+    case 1:
+      return !Group1->LineEdit1->text().isEmpty() && isOrthogonal;
+    case 2:
+      return !Group2->LineEdit1->text().isEmpty() && 
+	     !Group2->LineEdit2->text().isEmpty() && 
+	     !Group2->LineEdit3->text().isEmpty() && isOrthogonal;
+  }
+  return false;
 }
 
 //=================================================================================

src/BlocksGUI/BlocksGUI_BlockDlg.cxx

@@ -372,7 +372,7 @@ bool BlocksGUI_BlockDlg::execute (ObjectList& objects)
     case 0:
       if (!CORBA::is_nil(myFace1) && !CORBA::is_nil(myFace2)) {
         anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
-          MakeHexaSolidTwoFaces(myFace1, myFace2);
+          MakeHexa2Faces(myFace1, myFace2);
         res = true;
       }
       break;
@@ -381,7 +381,7 @@ bool BlocksGUI_BlockDlg::execute (ObjectList& objects)
           !CORBA::is_nil(myFace3) && !CORBA::is_nil(myFace4) &&
           !CORBA::is_nil(myFace5) && !CORBA::is_nil(myFace6)) {
         anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->
-          MakeHexaSolidSixFaces(myFace1, myFace2, myFace3, myFace4, myFace5, myFace6);
+          MakeHexa(myFace1, myFace2, myFace3, myFace4, myFace5, myFace6);
         res = true;
       }
       break;

src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx

@@ -235,7 +235,7 @@ void BlocksGUI_ExplodeDlg::SelectionIntoArgument()
     GEOM::GEOM_Object_var anObj =
       GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), aResult);
 
-    if (aResult && !anObj->_is_nil()) {
+    if ( aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
       myObject = anObj;
       mySelName->setText(GEOMBase::GetName(anObj));
     }
@@ -315,7 +315,7 @@ void BlocksGUI_ExplodeDlg::activateSelection()
   erasePreview(true);
 
   if (isAllSubShapes()) { // Sub-shapes selection disabled
-    globalSelection();
+    globalSelection( GEOM_ALLSHAPES );
     SelectionIntoArgument();
 
   } else {

src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx

@@ -384,17 +384,17 @@ bool BlocksGUI_QuadFaceDlg::execute (ObjectList& objects)
 
   switch (getConstructorId()) {
     case 0:
-      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuadFaceFourVertices
+      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuad4Vertices
         (myShape1, myShape2, myShape3, myShape4);
       res = true;
       break;
     case 1:
-      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuadFaceTwoEdges
+      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuad2Edges
         (myShape1, myShape2);
       res = true;
       break;
     case 2:
-      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuadFaceFourEdges
+      anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->MakeQuad
         (myShape1, myShape2, myShape3, myShape4);
       res = true;
       break;

src/BlocksGUI/BlocksGUI_TrsfDlg.cxx

@@ -259,7 +259,7 @@ void BlocksGUI_TrsfDlg::SelectionIntoArgument()
       GEOM::GEOM_Object_var anObj =
         GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), aResult);
 
-      if (aResult && !anObj->_is_nil()) {
+      if (aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
         myShape = anObj;
         mySelName[aCurrFocus]->setText(GEOMBase::GetName(anObj));
         enableWidgets();
@@ -279,7 +279,7 @@ void BlocksGUI_TrsfDlg::SelectionIntoArgument()
       GEOM::GEOM_Object_var anObj =
         GEOMBase::ConvertIOinGEOMObject(mySelection->firstIObject(), aResult);
 
-      if (aResult && !anObj->_is_nil()) {
+      if ( aResult && !anObj->_is_nil() && GEOMBase::IsShape( anObj ) ) {
         TColStd_IndexedMapOfInteger anIndexes;
         mySelection->GetIndex(mySelection->firstIObject(), anIndexes);
 
@@ -397,7 +397,7 @@ void BlocksGUI_TrsfDlg::activateSelection()
       return;
     }
   } else {
-    globalSelection();
+    globalSelection( GEOM_ALLSHAPES );
   }
 
   SelectionIntoArgument();

src/BooleanGUI/BooleanGUI_Dialog.cxx

@@ -137,6 +137,8 @@ void BooleanGUI_Dialog::Init()
   connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 
   initName( GroupConstructors->title() );
+
+  globalSelection( GEOM_ALLSHAPES );
 }
 
 
@@ -171,7 +173,7 @@ bool BooleanGUI_Dialog::ClickOnApply()
 //=================================================================================
 void BooleanGUI_Dialog::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
 
   if ( mySelection->IObjectCount() != 1 )
   {
@@ -183,7 +185,7 @@ void BooleanGUI_Dialog::SelectionIntoArgument()
   // nbSel == 1
   Standard_Boolean aRes = Standard_False;
   GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( mySelection->firstIObject(), aRes );
-  if ( !CORBA::is_nil( aSelectedObject ) && aRes )
+  if ( !CORBA::is_nil( aSelectedObject ) && aRes && GEOMBase::IsShape( aSelectedObject ) )
   {
     myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) );
     if      ( myEditCurrentArgument == myGroup->LineEdit1 )   myObject1 = aSelectedObject;
@@ -231,6 +233,7 @@ void BooleanGUI_Dialog::LineEditReturnPressed()
 void BooleanGUI_Dialog::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  globalSelection( GEOM_ALLSHAPES );
   connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 }
 

src/BuildGUI/BuildGUI_CompoundDlg.cxx

@@ -92,7 +92,9 @@ void BuildGUI_CompoundDlg::Init()
   connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply()));
   connect(GroupShapes->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument()));  
   connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ;
-  
+
+  globalSelection( GEOM_ALLSHAPES );
+
   initName( tr( "GEOM_COMPOUND" ) );
 }
 
@@ -128,18 +130,18 @@ bool BuildGUI_CompoundDlg::ClickOnApply()
 //=================================================================================
 void BuildGUI_CompoundDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
   QString aString = ""; /* name of selection */
 
   myOkShapes = false;
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects(mySelection, aString);
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects( mySelection, aString, true );
-  if(nbSel == 0) 
+  if ( nbSel == 0 ) 
     return;
-  if(nbSel != 1)
+  if ( nbSel != 1 )
-    aString = tr("%1_objects").arg(nbSel);
+    aString = QString( "%1_objects").arg( nbSel );
   
-  GEOMBase::ConvertListOfIOInListOfGO(mySelection->StoredIObjects(),  myShapes);
+  GEOMBase::ConvertListOfIOInListOfGO( mySelection->StoredIObjects(), myShapes, true );
-  myEditCurrentArgument->setText(aString);
+  myEditCurrentArgument->setText( aString );
   myOkShapes = true;
 }
 
@@ -168,6 +170,7 @@ void BuildGUI_CompoundDlg::SetEditCurrentArgument()
 void BuildGUI_CompoundDlg::ActivateThisDialog()
 {
   GEOMBase_Skeleton::ActivateThisDialog();
+  globalSelection( GEOM_ALLSHAPES );
   connect(mySelection, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument()));
 }
 

src/BuildGUI/BuildGUI_ShellDlg.cxx

@@ -136,21 +136,21 @@ bool BuildGUI_ShellDlg::ClickOnApply()
 //=================================================================================
 void BuildGUI_ShellDlg::SelectionIntoArgument()
 {
-  myEditCurrentArgument->setText("");
+  myEditCurrentArgument->setText( "" );
-  QString aString = "";
+  QString aString;
 
   myOkFacesAndShells = false;
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects(mySelection, aString);
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects( mySelection, aString, true );
-  if(nbSel == 0)
+  if ( nbSel == 0 )
     return;
-  if(nbSel != 1)
+  if ( nbSel != 1 )
-    aString = tr("%1_objects").arg(nbSel);
+    aString = QString( "%1_objects ").arg( nbSel );
 
-  GEOMBase::ConvertListOfIOInListOfGO(mySelection->StoredIObjects(),  myFacesAndShells);
+  GEOMBase::ConvertListOfIOInListOfGO( mySelection->StoredIObjects(),  myFacesAndShells, true );
-  if (!myFacesAndShells.length())
+  if ( !myFacesAndShells.length() )
     return;
 
-  myEditCurrentArgument->setText(aString);
+  myEditCurrentArgument->setText( aString );
   myOkFacesAndShells = true;
 }
 

src/EntityGUI/EntityGUI.cxx

@@ -32,6 +32,7 @@
 #include "QAD_RightFrame.h"
 #include "QAD_Desktop.h"
 #include "OCCViewer_Viewer3d.h"
+#include "OCCViewer_ViewFrame.h"
 #include "VTKViewer_ViewFrame.h"
 #include "GEOM_AssemblyBuilder.h"
 #include "SALOMEGUI_ImportOperation.h"

src/EntityGUI/EntityGUI_SubShapeDlg.cxx

@@ -185,7 +185,7 @@ void EntityGUI_SubShapeDlg::SelectionIntoArgument()
 
   QString aString = ""; /* name of selection */
 
-  int nbSel = GEOMBase::GetNameOfSelectedIObjects( mySelection, aString );
+  int nbSel = GEOMBase::GetNameOfSelectedIObjects( mySelection, aString, true );
   if( nbSel != 1 )
     return;
 
@@ -393,7 +393,7 @@ void EntityGUI_SubShapeDlg::ResetStateOfDialog()
 void EntityGUI_SubShapeDlg::SubShapeToggled()
 {
   if ( isAllSubShapes() )
-    globalSelection();
+    globalSelection( GEOM_ALLSHAPES );
   else
     localSelection( myObject, shapeType() );
 }

src/GEOM/GEOM_Engine.cxx

@@ -1,32 +1,34 @@
 #include "GEOM_Engine.hxx"
-#include <TCollection_ExtendedString.hxx>
+
+#include "GEOM_Solver.hxx"
+#include "GEOM_Function.hxx"
+#include "GEOM_ISubShape.hxx"
+#include "GEOM_SubShapeDriver.hxx"
+#include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx"
+
+#include "utilities.h"
+
 #include <Interface_DataMapIteratorOfDataMapOfIntegerTransient.hxx>
 
 #include <TDF_Tool.hxx>
 #include <TDF_Data.hxx>
 #include <TDataStd_Integer.hxx>
 #include <TDataStd_ChildNodeIterator.hxx>
-
-
 #include <TFunction_Driver.hxx>
-#include <TFunction_DriverTable.hxx>   
+#include <TFunction_DriverTable.hxx>
+
+#include <TopExp.hxx>
+#include <TopTools_IndexedMapOfShape.hxx>
 
 #include <TCollection_AsciiString.hxx>
+#include <TCollection_ExtendedString.hxx>
 #include <TColStd_SequenceOfAsciiString.hxx>
-#include <TopTools_IndexedMapOfShape.hxx>
-#include <TopExp.hxx>
 
-#include "GEOM_SubShapeDriver.hxx"  
+#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
-#include "GEOM_ISubShape.hxx"
-#include "GEOM_Function.hxx"
-#include "GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx"
 
+static GEOM_Engine* TheEngine = NULL;
 
-#include "utilities.h"  
+static TCollection_AsciiString BuildIDFromObject(Handle(GEOM_Object)& theObject)
-
-static GEOM_Engine* TheEngine = NULL;   
-
-static TCollection_AsciiString BuildIDFromObject(Handle(GEOM_Object)& theObject) 
 {
   TCollection_AsciiString anID(theObject->GetDocID()), anEntry;
   TDF_Tool::Entry(theObject->GetEntry(), anEntry);
@@ -34,7 +36,6 @@ static TCollection_AsciiString BuildIDFromObject(Handle(GEOM_Object)& theObject)
   return anID;
 }
 
-
 static TCollection_AsciiString BuildID(Standard_Integer theDocID, char* theEntry)
 {
   TCollection_AsciiString anID(theDocID);
@@ -62,7 +63,7 @@ GEOM_Engine* GEOM_Engine::GetEngine() { return TheEngine; }
  *  SetEngine
  */
 //=============================================================================
-void GEOM_Engine::SetEngine(GEOM_Engine* theEngine) { TheEngine = theEngine; }       
+void GEOM_Engine::SetEngine(GEOM_Engine* theEngine) { TheEngine = theEngine; }
 
 //=============================================================================
 /*!
@@ -72,7 +73,7 @@ void GEOM_Engine::SetEngine(GEOM_Engine* theEngine) { TheEngine = theEngine; }
 GEOM_Engine::GEOM_Engine()
 {
   TFunction_DriverTable::Get()->AddDriver(GEOM_Object::GetSubShapeID(), new GEOM_SubShapeDriver());
-      
+
   _OCAFApp = new GEOM_Application();
   _UndoLimit = 10;
 }
@@ -91,7 +92,7 @@ Handle(TDocStd_Document) GEOM_Engine::GetDocument(int theDocID)
     _mapIDDocument.Bind(theDocID, aDoc);
     TDataStd_Integer::Set(aDoc->Main(), theDocID);
   }
-  
+
   return Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID));
 }
 
@@ -99,15 +100,15 @@ Handle(TDocStd_Document) GEOM_Engine::GetDocument(int theDocID)
 /*!
  *  GetDocID
  */
-//============================================================================= 
+//=============================================================================
 int GEOM_Engine::GetDocID(Handle(TDocStd_Document) theDocument)
 {
-  if(theDocument.IsNull()) return -1;  
+  if(theDocument.IsNull()) return -1;
-  for(Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr(_mapIDDocument); anItr.More(); anItr.Next()) 
+  for(Interface_DataMapIteratorOfDataMapOfIntegerTransient anItr(_mapIDDocument); anItr.More(); anItr.Next())
     if(anItr.Value() == theDocument) return anItr.Key();
-    
+
-  return -1;    
+  return -1;
-  
+
 }
 
 //=============================================================================
@@ -119,7 +120,7 @@ Handle(GEOM_Object) GEOM_Engine::GetObject(int theDocID, char* theEntry)
 {
   TCollection_AsciiString anID = BuildID(theDocID, theEntry);
   if(_objects.IsBound(anID)) return Handle(GEOM_Object)::DownCast(_objects(anID));
- 
+
   TDF_Label aLabel;
   Handle(TDocStd_Document) aDoc = GetDocument(theDocID);
   TDF_Tool::Label(aDoc->Main().Data(), theEntry, aLabel, Standard_True);
@@ -164,7 +165,7 @@ Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape, H
   Handle(TDataStd_TreeNode) aRoot = TDataStd_TreeNode::Set(aDoc->Main());
 
   TDF_Label aChild = TDF_TagSource::NewChild(aDoc->Main());
-    
+
   Handle(GEOM_Function) aMainShape = theMainShape->GetLastFunction();
   Handle(GEOM_Object) anObject = new GEOM_Object(aChild, 28); //28 is SUBSHAPE type
   Handle(GEOM_Function) aFunction = anObject->AddFunction(GEOM_Object::GetSubShapeID(), 1);
@@ -172,7 +173,20 @@ Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape, H
   GEOM_ISubShape aSSI(aFunction);
   aSSI.SetMainShape(aMainShape);
   aSSI.SetIndices(theIndices);
- 
+
+  try {
+    GEOM_Solver aSolver (GEOM_Engine::GetEngine());
+    if (!aSolver.ComputeFunction(aFunction)) {
+      MESSAGE("GEOM_Engine::AddSubShape Error: Can't build a sub shape");
+      return NULL;
+    }
+  }
+  catch (Standard_Failure) {
+    Handle(Standard_Failure) aFail = Standard_Failure::Caught();
+    MESSAGE("GEOM_Engine::AddSubShape Error: " << aFail->GetMessageString());
+    return NULL;
+  }
+
   //Put an object in the map of created objects
   TCollection_AsciiString anID = BuildIDFromObject(anObject);
   if(_objects.IsBound(anID)) _objects.UnBind(anID);
@@ -199,7 +213,7 @@ Handle(GEOM_Object) GEOM_Engine::AddSubShape(Handle(GEOM_Object) theMainShape, H
 /*!
  *  RemoveObject
  */
-//============================================================================= 
+//=============================================================================
 bool GEOM_Engine::RemoveObject(Handle(GEOM_Object) theObject)
 {
   if(!theObject) return false;
@@ -212,27 +226,25 @@ bool GEOM_Engine::RemoveObject(Handle(GEOM_Object) theObject)
   aLabel.ForgetAllAttributes(Standard_True);
 
   theObject.Nullify();
-  
+
   return true;
 }
 
-
 //=============================================================================
 /*!
  *  Undo
  */
-//============================================================================= 
+//=============================================================================
 void GEOM_Engine::Undo(int theDocID)
 {
   GetDocument(theDocID)->Undo();
 }
 
-
 //=============================================================================
 /*!
  *  Redo
  */
-//============================================================================= 
+//=============================================================================
 void GEOM_Engine::Redo(int theDocID)
 {
   GetDocument(theDocID)->Redo();
@@ -242,12 +254,12 @@ void GEOM_Engine::Redo(int theDocID)
 /*!
  *  Save
  */
-//============================================================================= 
+//=============================================================================
 bool GEOM_Engine::Save(int theDocID, char* theFileName)
 {
   if(!_mapIDDocument.IsBound(theDocID)) return false;
   Handle(TDocStd_Document) aDoc = Handle(TDocStd_Document)::DownCast(_mapIDDocument(theDocID));
- 
+
   _OCAFApp->SaveAs(aDoc, theFileName);
 
   return true;
@@ -257,18 +269,18 @@ bool GEOM_Engine::Save(int theDocID, char* theFileName)
 /*!
  *  Load
  */
-//=============================================================================   
+//=============================================================================
-bool GEOM_Engine::Load(int theDocID, char* theFileName) 
+bool GEOM_Engine::Load(int theDocID, char* theFileName)
 {
   Handle(TDocStd_Document) aDoc;
   if(_OCAFApp->Open(theFileName, aDoc) != CDF_RS_OK) return false;
 
-  aDoc->SetUndoLimit(_UndoLimit);    
+  aDoc->SetUndoLimit(_UndoLimit);
 
   if(_mapIDDocument.IsBound(theDocID)) _mapIDDocument.UnBind(theDocID);
   _mapIDDocument.Bind(theDocID, aDoc);
 
-  TDataStd_Integer::Set(aDoc->Main(), theDocID);    
+  TDataStd_Integer::Set(aDoc->Main(), theDocID);
 
   return true;
 }
@@ -277,7 +289,7 @@ bool GEOM_Engine::Load(int theDocID, char* theFileName)
 /*!
  *  Close
  */
-//=============================================================================   
+//=============================================================================
 void GEOM_Engine::Close(int theDocID)
 {
   if(_mapIDDocument.IsBound(theDocID)) {

src/GEOM/GEOM_Function.cxx

@@ -1,8 +1,11 @@
-using namespace std; 
+using namespace std;
 
 #include "GEOM_Function.hxx"
 #include "GEOM_Object.hxx"
 #include "GEOM_Solver.hxx"
+
+#include "utilities.h"
+
 #include <TDF.hxx>
 #include <TDF_Data.hxx>
 #include <TDF_ChildIterator.hxx>
@@ -28,7 +31,7 @@ using namespace std;
 #include <TCollection_AsciiString.hxx>
 #include <TCollection_ExtendedString.hxx>
 
-#include "utilities.h"
+#include <Standard_ErrorHandler.hxx> // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC
 
 #define ARGUMENT_LABEL 1
 #define RESULT_LABEL 2
@@ -45,7 +48,7 @@ const Standard_GUID& GEOM_Function::GetFunctionTreeID()
 {
   static Standard_GUID aFunctionTreeID("FF1BBB00-5D14-4df2-980B-3A668264EA16");
   return aFunctionTreeID;
-}   
+}
 
 
 //=======================================================================
@@ -56,7 +59,7 @@ const Standard_GUID& GEOM_Function::GetDependencyID()
 {
   static Standard_GUID aDependencyID("E2620650-2354-41bd-8C2C-210CFCD00948");
   return aDependencyID;
-}   
+}
 
 //=============================================================================
 /*!
@@ -79,12 +82,12 @@ GEOM_Function::GEOM_Function(const TDF_Label& theEntry, const Standard_GUID& the
 : _label(theEntry)
 {
   TFunction_Function::Set(theEntry, theGUID);
-  TDataStd_Integer::Set(theEntry, theType);   
+  TDataStd_Integer::Set(theEntry, theType);
 
   //Add function to a function tree
   Handle(TDocStd_Document) aDoc = TDocStd_Owner::GetDocument(theEntry.Data());
   Handle(TDataStd_TreeNode) aRoot, aNode;
-  if(!aDoc->Main().FindAttribute(GetFunctionTreeID(), aRoot)) 
+  if(!aDoc->Main().FindAttribute(GetFunctionTreeID(), aRoot))
     aRoot = TDataStd_TreeNode::Set(aDoc->Main(), GetFunctionTreeID());
 
   aNode = TDataStd_TreeNode::Set(theEntry, GetFunctionTreeID());
@@ -95,7 +98,7 @@ GEOM_Function::GEOM_Function(const TDF_Label& theEntry, const Standard_GUID& the
 /*!
  *  GetOwner
  */
-//============================================================================= 
+//=============================================================================
 TDF_Label GEOM_Function::GetOwnerEntry()
 {
   TDF_Label aFather = _label.Father();
@@ -103,8 +106,8 @@ TDF_Label GEOM_Function::GetOwnerEntry()
     if(aFather.IsAttribute(GEOM_Object::GetObjectID())) return aFather;
     aFather = aFather.Father();
   }
-  
+
-  return TDF_Label();    
+  return TDF_Label();
 }
 
 //=============================================================================
@@ -118,7 +121,7 @@ int GEOM_Function::GetType()
   Handle(TDataStd_Integer) aType;
   if(!_label.FindAttribute(TDataStd_Integer::GetID(), aType)) return 0;
   _isDone = true;
-  return aType->Get();          
+  return aType->Get();
 }
 
 //=============================================================================
@@ -129,7 +132,7 @@ int GEOM_Function::GetType()
 TopoDS_Shape GEOM_Function::GetValue()
 {
   _isDone = false;
-  
+
   TopoDS_Shape aShape;
   TDF_Label aLabel = GetOwnerEntry();
   if(aLabel.IsRoot()) return aShape;
@@ -139,7 +142,7 @@ TopoDS_Shape GEOM_Function::GetValue()
     try {
       GEOM_Solver aSolver(GEOM_Engine::GetEngine());
       if (!aSolver.ComputeFunction(this)) {
-	MESSAGE("GEOM_Object::GetValue Error : Can't build a sub shape");	 
+	MESSAGE("GEOM_Object::GetValue Error : Can't build a sub shape");
 	return aShape;
       }
     }
@@ -150,14 +153,14 @@ TopoDS_Shape GEOM_Function::GetValue()
     }
   }
 
-  TDF_Label aResultLabel = _label.FindChild(RESULT_LABEL);  
+  TDF_Label aResultLabel = _label.FindChild(RESULT_LABEL);
   Handle(TNaming_NamedShape) aNS;
   if(!aResultLabel.FindAttribute(TNaming_NamedShape::GetID(), aNS)) return aShape;
 
   aShape = aNS->Get();
 
   _isDone = true;
-  return aShape;          
+  return aShape;
 }
 
 //=============================================================================
@@ -172,7 +175,7 @@ void GEOM_Function::SetValue(TopoDS_Shape& theShape)
   TNaming_Builder aBuilder(aResultLabel);
 
   aBuilder.Generated(theShape);
-  
+
   _isDone = true;
 }
 
@@ -401,7 +404,7 @@ void GEOM_Function::SetReference(int thePosition, Handle(GEOM_Function) theRefer
  *  GetReference
  */
 //=============================================================================
-Handle(GEOM_Function) GEOM_Function::GetReference(int thePosition) 
+Handle(GEOM_Function) GEOM_Function::GetReference(int thePosition)
 {
   _isDone = false;
   if(thePosition <= 0) return NULL;
@@ -422,13 +425,13 @@ Handle(GEOM_Function) GEOM_Function::GetReference(int thePosition)
 void GEOM_Function::SetStringArray(int thePosition, const Handle(TColStd_HArray1OfExtendedString)& theArray)
 {
   _isDone = false;
-  if(thePosition <= 0 || theArray.IsNull()) return; 
+  if(thePosition <= 0 || theArray.IsNull()) return;
   TDF_Label anArgLabel = ARGUMENT(thePosition);
 
   Handle(TDataStd_ExtStringArray) anArray = new TDataStd_ExtStringArray;
   anArray->ChangeArray(theArray);
   anArgLabel.AddAttribute(anArray);
-  
+
   _isDone = true;
 }
 
@@ -437,7 +440,7 @@ void GEOM_Function::SetStringArray(int thePosition, const Handle(TColStd_HArray1
 /*!
  *  GetStringArray
  */
-//=============================================================================  
+//=============================================================================
 Handle(TColStd_HArray1OfExtendedString) GEOM_Function::GetStringArray(int thePosition)
 {
   _isDone = false;
@@ -458,7 +461,7 @@ const Standard_GUID& GEOM_Function::GetReferencesTreeID()
 {
   static Standard_GUID aReferencesTreeID("FF1BBB10-5D14-4df2-980B-3A668264EA16");
   return aReferencesTreeID;
-}   
+}
 
 //=============================================================================
 /*!
@@ -503,7 +506,7 @@ void GEOM_Function::SetReferenceList (int thePosition,
  *  GetReferenceList
  */
 //=============================================================================
-Handle(TColStd_HSequenceOfTransient) GEOM_Function::GetReferenceList(int thePosition) 
+Handle(TColStd_HSequenceOfTransient) GEOM_Function::GetReferenceList(int thePosition)
 {
   Handle(TColStd_HSequenceOfTransient) aResult = new TColStd_HSequenceOfTransient;
   _isDone = false;
@@ -556,7 +559,7 @@ void GEOM_Function::SetShape(int thePosition, const TopoDS_Shape& theShape)
 /*!
  *  GetShape
  */
-//=============================================================================  
+//=============================================================================
 TopoDS_Shape GEOM_Function::GetShape(int thePosition)
 {
   _isDone = false;
@@ -577,7 +580,7 @@ TopoDS_Shape GEOM_Function::GetShape(int thePosition)
 /*!
  *  GetDependency
  */
-//=============================================================================  
+//=============================================================================
 void GEOM_Function::GetDependency(TDF_LabelSequence& theSeq)
 {
   TDF_ChildIterator anIterator(ARGUMENTS, Standard_True);
@@ -589,15 +592,15 @@ void GEOM_Function::GetDependency(TDF_LabelSequence& theSeq)
 //=======================================================================
 //function :  GEOM_Function_Type_
 //purpose  :
-//======================================================================= 
+//=======================================================================
 Standard_EXPORT Handle_Standard_Type& GEOM_Function_Type_()
 {
 
   static Handle_Standard_Type aType1 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(MMgt_TShared); 
+  if ( aType1.IsNull()) aType1 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(Standard_Transient);
   if ( aType2.IsNull()) aType2 = STANDARD_TYPE(Standard_Transient);
- 
+
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOM_Function",
@@ -612,7 +615,7 @@ Standard_EXPORT Handle_Standard_Type& GEOM_Function_Type_()
 //=======================================================================
 //function : DownCast
 //purpose  :
-//======================================================================= 
+//=======================================================================
 
 const Handle(GEOM_Function) Handle(GEOM_Function)::DownCast(const Handle(Standard_Transient)& AnObject)
 {
@@ -626,7 +629,3 @@ const Handle(GEOM_Function) Handle(GEOM_Function)::DownCast(const Handle(Standar
 
   return _anOtherObject ;
 }
-
-
-
-

src/GEOM/GEOM_SubShapeDriver.cxx

@@ -35,61 +35,64 @@ using namespace std;
 
 //=======================================================================
 //function : GEOM_SubShapeDriver
-//purpose  : 
+//purpose  :
 //=======================================================================
-GEOM_SubShapeDriver::GEOM_SubShapeDriver() 
+GEOM_SubShapeDriver::GEOM_SubShapeDriver()
 {
 }
 
 //=======================================================================
 //function : Execute
 //purpose  :
-//======================================================================= 
+//=======================================================================
 Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_Logbook& log) const
 {
-  if (Label().IsNull()) return 0;    
+  if (Label().IsNull()) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
 
   GEOM_ISubShape aCI (aFunction);
 
   TDF_Label aLabel = aCI.GetMainShape()->GetOwnerEntry();
-  if(aLabel.IsRoot()) return 0;
+  if (aLabel.IsRoot()) return 0;
   Handle(GEOM_Object) anObj = GEOM_Object::GetObject(aLabel);
-  if(anObj.IsNull()) return 0;
+  if (anObj.IsNull()) return 0;
   TopoDS_Shape aMainShape = anObj->GetValue();
-  if(aMainShape.IsNull()) return 0;    
+  if (aMainShape.IsNull()) return 0;
-  
+
-  Handle(TColStd_HArray1OfInteger) anIndices = aCI.GetIndices();  
+  Handle(TColStd_HArray1OfInteger) anIndices = aCI.GetIndices();
-  if(anIndices.IsNull() || anIndices->Length() <= 0) return 0;
+  if (anIndices.IsNull() || anIndices->Length() <= 0) return 0;
 
   BRep_Builder B;
   TopoDS_Compound aCompound;
   TopoDS_Shape aShape;
 
-  if(anIndices->Length() == 1 && anIndices->Value(1) == -1) { //The empty subshape 
+  if (anIndices->Length() == 1 && anIndices->Value(1) == -1) { //The empty subshape
     B.MakeCompound(aCompound);
     aShape = aCompound;
-  }
+
-  else {
+  } else {
-    
+
     TopTools_IndexedMapOfShape aMapOfShapes;
     TopExp::MapShapes(aMainShape, aMapOfShapes);
 
-    if(anIndices->Length() > 1) {
+    if (anIndices->Length() > 1) {
-      
+
       B.MakeCompound(aCompound);
 
-      for(int i = anIndices->Lower(); i<= anIndices->Upper(); i++) {
+      for (int i = anIndices->Lower(); i<= anIndices->Upper(); i++) {
 	if (aMapOfShapes.Extent() < anIndices->Value(i))
-	  Standard_NullObject::Raise("GEOM_SubShapeDriver::Execute:Index is out range"); 
+	  Standard_NullObject::Raise("GEOM_SubShapeDriver::Execute: Index is out of range");
 	TopoDS_Shape aSubShape = aMapOfShapes.FindKey(anIndices->Value(i));
-	if(aSubShape.IsNull()) continue;
+	if (aSubShape.IsNull()) continue;
 	B.Add(aCompound,aSubShape);
       }
-      
+
       aShape = aCompound;
-    }
+
-    else {
+    } else {
+
+      if (aMapOfShapes.Extent() < anIndices->Value(1))
+        Standard_NullObject::Raise("GEOM_SubShapeDriver::Execute: Index is out of range");
       aShape = aMapOfShapes.FindKey(anIndices->Value(1));
     }
   }
@@ -98,26 +101,26 @@ Standard_Integer GEOM_SubShapeDriver::Execute(TFunction_Logbook& log) const
 
   aFunction->SetValue(aShape);
 
-  log.SetTouched(Label()); 
+  log.SetTouched(Label());
 
-  return 1;    
+  return 1;
 }
 
 
 //=======================================================================
 //function :  GEOM_SubShapeDriver_Type_
 //purpose  :
-//======================================================================= 
+//=======================================================================
 Standard_EXPORT Handle_Standard_Type& GEOM_SubShapeDriver_Type_()
 {
 
   static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
   if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared); 
+  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
   if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
+
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOM_SubShapeDriver",
@@ -132,7 +135,7 @@ Standard_EXPORT Handle_Standard_Type& GEOM_SubShapeDriver_Type_()
 //=======================================================================
 //function : DownCast
 //purpose  :
-//======================================================================= 
+//=======================================================================
 const Handle(GEOM_SubShapeDriver) Handle(GEOM_SubShapeDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
 {
   Handle(GEOM_SubShapeDriver) _anOtherObject;
@@ -145,5 +148,3 @@ const Handle(GEOM_SubShapeDriver) Handle(GEOM_SubShapeDriver)::DownCast(const Ha
 
   return _anOtherObject ;
 }
-
-

src/GEOMBase/GEOMBase.cxx

@@ -48,6 +48,7 @@
 #include "VTKViewer_RenderWindowInteractor.h"
 #include "OCCViewer_ViewPort3d.h"
 #include "OCCViewer_Viewer3d.h"
+#include "OCCViewer_ViewFrame.h"
 
 #include "SALOME_ListIteratorOfListIO.hxx"
 #include "GEOM_AISTrihedron.hxx"
@@ -76,7 +77,10 @@
 #include <Precision.hxx>
 
 #include <vtkRenderer.h>
+#include <qvaluelist.h>
+#include <qstringlist.h> 
 
+#include "GEOMImpl_Types.hxx"
 
 using namespace std;
 
@@ -167,22 +171,39 @@ bool GEOMBase::GetTopoFromSelection(SALOME_Selection *Sel, TopoDS_Shape& tds)
   return false;
 }
 
-
 //=======================================================================
 // function : GetNameOfSelectedIObjects()
 // purpose  : Define the name geom++ or other name of mono or multi sel.
 //=======================================================================
-int GEOMBase::GetNameOfSelectedIObjects(SALOME_Selection* Sel, QString& aName)
+int GEOMBase::GetNameOfSelectedIObjects( SALOME_Selection* theSel,
+                                         QString&          theName,
+                                         const bool        theShapesOnly )
 {
-  int nbSel = Sel->IObjectCount();
+  if ( !theShapesOnly )
-  if(nbSel == 1) {
+  {
-    Handle(SALOME_InteractiveObject) IObject = Sel->firstIObject();
+    int nbSel = theSel->IObjectCount();
-    aName = IObject->getName();
+    if ( nbSel == 1 )
+    {
+      Handle(SALOME_InteractiveObject) anIObj = theSel->firstIObject();
+      theName = anIObj->getName();
+    }
+    else
+      theName = QObject::tr("%1_objects").arg(nbSel);
+
+    return nbSel;
   }
-  else {
+  else
-    aName = QObject::tr("%1_objects").arg(nbSel);
+  {
+    QStringList aNames;
+    GEOM::ListOfGO anObjs;
+    ConvertListOfIOInListOfGO( theSel->StoredIObjects(), anObjs, theShapesOnly );
+    if ( anObjs.length() == 1 )
+      theName = GetName( anObjs[ 0 ] );
+    else
+      theName = QString( "%1_objects" ).arg( anObjs.length() );
+
+    return anObjs.length();
   }
-  return nbSel;
 }
 
 
@@ -586,27 +607,29 @@ GEOM::GEOM_Object_ptr GEOMBase::ConvertIOinGEOMObject( const Handle(SALOME_Inter
 // function : ConvertListOfIOInListOfGO()
 // purpose  : 
 //=======================================================================
-void GEOMBase::ConvertListOfIOInListOfGO(const SALOME_ListIO& aList, GEOM::ListOfGO& listGO)
+void GEOMBase::ConvertListOfIOInListOfGO( const SALOME_ListIO& theList,
+                                          GEOM::ListOfGO&      theListGO,
+                                          const bool           theShapesOnly )
 {
-  int nbSel = aList.Extent();  
+  int nbSel = theList.Extent();  
-  listGO.length(nbSel);
+  theListGO.length( nbSel );
-  int j=0;
+  SALOME_ListIteratorOfListIO anIter( theList );
-  SALOME_ListIteratorOfListIO It(aList);
+  SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
-  for(int i=0; It.More(); It.Next(), i++) {
+  int j = 0;
-    Handle(SALOME_InteractiveObject) IObject = It.Value();
+  for ( int i=0; anIter.More(); anIter.Next(), i++ )
-    SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument();
+  {
-    SALOMEDS::SObject_var aSObj = aStudy->FindObjectID(IObject->getEntry());
+    Handle(SALOME_InteractiveObject) anIObj = anIter.Value();
-    
+    SALOMEDS::SObject_var aSObj = aStudy->FindObjectID( anIObj->getEntry() );
-    if(!aSObj->_is_nil()) {
+
+    if ( !aSObj->_is_nil() )
+    {
       GEOM::GEOM_Object_var aGeomObj = GEOM::GEOM_Object::_narrow(aSObj->GetObject());
-      if(!CORBA::is_nil(aGeomObj))
+      if ( !CORBA::is_nil( aGeomObj ) && ( !theShapesOnly || IsShape( aGeomObj ) ) )
-	{
+        theListGO[ j++ ] = aGeomObj;
-	  listGO[j] = aGeomObj;
-	  j++;
-	}
     }
   }
-  listGO.length(j);
+  
+  theListGO.length( j );
 }
 
 //=================================================================================
@@ -907,7 +930,10 @@ const char* GEOMBase::GetName( GEOM::GEOM_Object_ptr theObj )
   return "";  
 }
 
-
+bool GEOMBase::IsShape( GEOM::GEOM_Object_ptr theObj )
+{
+  return !theObj->_is_nil() && theObj->IsShape();
+}
 
 
 

src/GEOMBase/GEOMBase.h

@@ -45,6 +45,7 @@ class GEOM_Actor;
 class SALOME_Selection;
 class SALOME_ListIO;
 class QAD_Desktop;
+class TColStd_MapOfInteger;
 
 class QWidget;
 
@@ -70,7 +71,7 @@ public :
   static TopoDS_Shape GetShapeFromIOR(QString IOR);
   static bool GetShape( const GEOM::GEOM_Object_ptr&, TopoDS_Shape&, const TopAbs_ShapeEnum = TopAbs_SHAPE );
   static bool GetTopoFromSelection(SALOME_Selection *Sel, TopoDS_Shape& tds);
-  static int GetNameOfSelectedIObjects(SALOME_Selection* Sel, QString& aName); 
+  static int GetNameOfSelectedIObjects(SALOME_Selection* Sel, QString& aName, const bool theShapesOnly = false );
   static bool GetShapeTypeString(const TopoDS_Shape& aShape, Standard_CString& aTypeString);
 
   /* Convertions */
@@ -94,8 +95,9 @@ public :
   static GEOM::GEOM_Object_ptr ConvertIOinGEOMObject(const Handle(SALOME_InteractiveObject)& IO, 
 					      Standard_Boolean& testResult);
 
-  static void ConvertListOfIOInListOfGO(const SALOME_ListIO& aList,
+  static void ConvertListOfIOInListOfGO( const SALOME_ListIO& aList,
-				 GEOM::ListOfGO& listGO); 
+                                         GEOM::ListOfGO& listGO,
+                                         const bool theShapesOnly = false ); 
 
   static GEOM::GEOM_Object_ptr GetObjectFromIOR( const char* theIOR );
 
@@ -129,6 +131,8 @@ public :
 
   /* Gets name of object */
   static const char* GetName( GEOM::GEOM_Object_ptr );
+
+  static bool IsShape( GEOM::GEOM_Object_ptr theObj );
 };
 
 #endif

src/GEOMBase/GEOMBase_Helper.cxx

@@ -93,7 +93,7 @@ GEOMBase_Helper::~GEOMBase_Helper()
   if ( hasCommand() )
     abortCommand();
 
-  globalSelection( -1, true );
+  globalSelection( GEOM_ALLOBJECTS, true );
 
   delete myDisplayer;
 }

src/GEOMBase/GEOMBase_Helper.h

@@ -29,6 +29,7 @@
 #ifndef GEOMBASE_HELPER_H
 #define GEOMBASE_HELPER_H
 
+#include "GEOM_Displayer.h"
 #include "SALOME_Prs.h"
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
@@ -42,7 +43,6 @@ typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
 class GEOM_Operation;
 class QAD_Study;
 class TopoDS_Shape;
-class GEOM_Displayer;
 class QAD_ViewFrame;
 class TColStd_MapOfInteger;
 
@@ -89,7 +89,7 @@ protected:
   void localSelection( const ObjectList&, const int );
   void localSelection( GEOM::GEOM_Object_ptr, const int );
   void activate( const int );
-  void globalSelection( const int = -1, const bool = false  );
+  void globalSelection( const int = GEOM_ALLOBJECTS, const bool = false  );
   void globalSelection( const TColStd_MapOfInteger&, const bool = false );
   void updateViewer    ();
 

src/GEOMClient/GEOM_Client.cxx

@@ -113,6 +113,20 @@ Standard_Integer GEOM_Client::Find( const TCollection_AsciiString& IOR, TopoDS_S
   return 0;
 }
 
+//=======================================================================
+// function : Find()
+// purpose  : 
+//=======================================================================
+Standard_Integer GEOM_Client::Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR )
+{
+  for ( Standard_Integer i = 1; i<= myShapes.Length(); i++ ) {
+    if (myShapes.Value(i) == S) {
+      IOR = myIORs.Value(i);
+      return i;
+    }
+  }
+  return 0;
+}
 
 //=======================================================================
 // function : Bind()

src/GEOMClient/GEOM_Client.hxx

@@ -76,6 +76,7 @@ public:
   Standard_EXPORT   GEOM_Client();
   Standard_EXPORT   GEOM_Client(Engines::Container_ptr client);
   Standard_EXPORT   Standard_Integer Find( const TCollection_AsciiString& IOR, TopoDS_Shape& S ) ;
+  Standard_EXPORT   Standard_Integer Find( const TopoDS_Shape& S, TCollection_AsciiString& IOR ) ;
   Standard_EXPORT   void Bind( const TCollection_AsciiString& IOR, const TopoDS_Shape& S ) ;
   Standard_EXPORT   TopoDS_Shape GetShape( GEOM::GEOM_Gen_ptr geom, GEOM::GEOM_Object_ptr aShape );
   Standard_EXPORT   void RemoveShapeFromBuffer( const TCollection_AsciiString& IOR ) ;

src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx

@@ -46,6 +46,17 @@ GEOM_LogicalFilter::GEOM_LogicalFilter( const GEOM_ListOfFilter& theFilters,
   myLogOp = theLogOp;
 }
 
+//=======================================================================
+// name    : GEOM_LogicalFilter::GEOM_LogicalFilter
+// Purpose : Constructor
+//=======================================================================
+GEOM_LogicalFilter::GEOM_LogicalFilter( const Handle(SALOME_Filter)& theFilter,
+                                        const int                    theLogOp )
+{
+  myFilters.Append( theFilter );
+  myLogOp = theLogOp;
+}
+
 //=======================================================================
 // name    : GEOM_LogicalFilter::~GEOM_LogicalFilter
 // Purpose : Destructor
@@ -68,8 +79,10 @@ Standard_Boolean GEOM_LogicalFilter::IsOk( const Handle(SALOME_InteractiveObject
     {
       if ( myLogOp == LO_OR && anIter.Value()->IsOk( theIO ) )
         return true;
-      if ( myLogOp == LO_AND && anIter.Value()->IsOk( theIO ) )
+      if ( myLogOp == LO_AND && !anIter.Value()->IsOk( theIO ) )
         return false;
+      if ( myLogOp == LO_NOT )
+        return !anIter.Value()->IsOk( theIO );
     }
   }
 

src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx

@@ -49,11 +49,12 @@ class GEOM_LogicalFilter : public SALOME_Filter
 {
 public:
 
-  enum { LO_OR, LO_AND, LO_UNDEFINED };
+  enum { LO_OR, LO_AND, LO_NOT, LO_UNDEFINED };
 
 public:
 
                               GEOM_LogicalFilter( const GEOM_ListOfFilter&, const int  );
+                              GEOM_LogicalFilter( const Handle(SALOME_Filter)&, const int );
 
 
   virtual                     ~GEOM_LogicalFilter();

src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx

@@ -84,8 +84,10 @@ static GEOM::GEOM_Object_ptr convertIOinGEOMObject(
 // function : ShapeTypeFilter
 // purpose  : 
 //=======================================================================
-GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( TopAbs_ShapeEnum theShapeType ) 
+GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( const TopAbs_ShapeEnum theShapeType,
+                                            const bool theIsAll ) 
 {
+  myIsAll = theIsAll;
   myShapeTypes.Add( theShapeType );
   myTypeFilter = new SALOME_TypeFilter( "GEOM" );
 }
@@ -94,8 +96,10 @@ GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( TopAbs_ShapeEnum theShapeType )
 // function : ShapeTypeFilter
 // purpose  : 
 //=======================================================================
-GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( const TColStd_MapOfInteger& theShapeTypes ) 
+GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( const TColStd_MapOfInteger& theShapeTypes,
+                                            const bool theIsAll ) 
 {
+  myIsAll = theIsAll;
   myShapeTypes = theShapeTypes;
   myTypeFilter = new SALOME_TypeFilter( "GEOM" );
 }
@@ -104,15 +108,18 @@ GEOM_ShapeTypeFilter::GEOM_ShapeTypeFilter( const TColStd_MapOfInteger& theShape
 // function : IsOk
 // purpose  : 
 //=======================================================================
-Standard_Boolean GEOM_ShapeTypeFilter::IsOk(const Handle(SALOME_InteractiveObject)& anObj) const 
+Standard_Boolean GEOM_ShapeTypeFilter::IsOk(
+  const Handle(SALOME_InteractiveObject)& anObj ) const 
 {
   if ( !myTypeFilter->IsOk(anObj) ) 
     return Standard_False;
 
   Standard_Boolean aResult = Standard_False;
   GEOM::GEOM_Object_ptr aGeomObj = convertIOinGEOMObject( anObj, aResult );
-  if ( !CORBA::is_nil( aGeomObj ) && aResult )
+  if ( !CORBA::is_nil( aGeomObj ) && aResult && aGeomObj->IsShape() )
   {
+    if ( myIsAll )
+      return true;
     TopoDS_Shape aShape;
     if ( getShape( aGeomObj, aShape ) )
     {
@@ -131,3 +138,27 @@ Standard_Boolean GEOM_ShapeTypeFilter::IsShapeOk( const TopoDS_Shape& ) const
 {
   return Standard_True;
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx

@@ -46,7 +46,8 @@
 #include <TopoDS_Shape.hxx>
 #include <TColStd_MapOfInteger.hxx>
 
-class GEOM_ShapeTypeFilter : public SALOME_Filter {
+class GEOM_ShapeTypeFilter : public SALOME_Filter
+{
 
 public:
 
@@ -63,9 +64,11 @@ public:
         if (anAddress) Standard::Free((Standard_Address&)anAddress); 
       }
  // Methods PUBLIC
- // 
+ //
-Standard_EXPORT GEOM_ShapeTypeFilter( TopAbs_ShapeEnum theShapeType );
+Standard_EXPORT GEOM_ShapeTypeFilter( const TopAbs_ShapeEnum theShapeType,
-Standard_EXPORT GEOM_ShapeTypeFilter( const TColStd_MapOfInteger& theShapeTypes );
+                                      const bool theIsAll = false );
+Standard_EXPORT GEOM_ShapeTypeFilter( const TColStd_MapOfInteger& theShapeTypes,
+                                      const bool theIsAll = false );
 Standard_EXPORT ~GEOM_ShapeTypeFilter();
 
 Standard_EXPORT virtual  Standard_Boolean IsOk(const Handle(SALOME_InteractiveObject)& anobj) const;
@@ -80,7 +83,7 @@ Standard_EXPORT virtual  Standard_Boolean IsOk(const Handle(SALOME_InteractiveOb
 protected:
 
  // Methods PROTECTED
- // 
+ //
  Standard_EXPORT virtual Standard_Boolean IsShapeOk(const TopoDS_Shape& theShape ) const;
 
 
@@ -91,12 +94,7 @@ Handle(SALOME_TypeFilter) myTypeFilter;
 
 private: 
 
- // Methods PRIVATE
+ bool myIsAll;
- // 
-
-
- // Fields PRIVATE
- //
 
 
 };

src/GEOMGUI/GEOM_Displayer.cxx

@@ -135,6 +135,9 @@ static inline Handle(SALOME_Filter) getFilter( const int theMode )
       case GEOM_CONE      : aFilter = new GEOM_FaceFilter( StdSelect_Cone     ); break;
       
       case GEOM_PREVIEW   : aFilter = new GEOM_PreviewFilter(); break;
+      
+      case GEOM_ALLSHAPES : aFilter = new GEOM_ShapeTypeFilter( -1, true ); break;
+      case GEOM_ALLGEOM   : aFilter = new SALOME_TypeFilter( "GEOM" ); break;
 
       default             : aFilter = new GEOM_TypeFilter( theMode ); break;
     }
@@ -264,6 +267,13 @@ void GEOM_Displayer::Display( const Handle(SALOME_InteractiveObject)& theIO, con
   
   if ( vf )
   {
+      if ( vf->inherits( "VTKViewer_ViewFrame" ) )
+      {
+        SALOME_Prs* prs = vf->CreatePrs( !theIO.IsNull() ? theIO->getEntry() : 0 );
+        ((SALOME_View*)vf)->Erase( prs, true );
+        delete prs;
+      }
+    
     SALOME_Prs* prs = buildPresentation( theIO, vf );
     
     if ( prs )
@@ -273,7 +283,7 @@ void GEOM_Displayer::Display( const Handle(SALOME_InteractiveObject)& theIO, con
       vf->AfterDisplay( this );
       
       if ( updateViewer )
-	vf->Repaint();
+        vf->Repaint();
       
       delete prs;  // delete presentation because displayer is its owner
     }
@@ -476,7 +486,7 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
       {
         aTrh = new GEOM_AISTrihedron( aPlc );
 
-        if ( HasColor() )
+        if ( HasColor() )  
           aTrh->SetColor( (Quantity_NameOfColor)GetColor() );
 
         if ( HasWidth() )
@@ -570,7 +580,6 @@ void GEOM_Displayer::Update( SALOME_OCCPrs* prs )
         AIS_ListOfInteractive IOList;
         occPrs->GetObjects( IOList );
         AIS_ListIteratorOfListOfInteractive Iter( IOList );
-        int i = 0;
         for ( ; Iter.More(); Iter.Next() )
         {
           Handle(GEOM_AISShape) AISShape = Handle(GEOM_AISShape)::DownCast( Iter.Value() );
@@ -612,7 +621,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
   {
     myToActivate = false;
     GEOM_VTKTrihedron* aTrh = GEOM_VTKTrihedron::New();
-
+    
     if ( HasColor() )
     {
       Quantity_Color aColor( (Quantity_NameOfColor)GetColor() );
@@ -625,14 +634,13 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
       return;
 
     gp_Ax2 anAx2 = aPlane->Pln().Position().Ax2();
-
     aTrh->SetPlacement( new Geom_Axis2Placement( anAx2 ) );
 
     if ( VTKViewer_ViewFrame* vf = dynamic_cast<VTKViewer_ViewFrame*>( GetActiveView() ) )
       aTrh->SetSize( 0.5 * vf->GetTrihedronSize() );
 
     vtkPrs->AddObject( aTrh );
-
+      
     theActors = vtkActorCollection::New();
     theActors->AddItem( aTrh );
   }
@@ -661,7 +669,7 @@ void GEOM_Displayer::Update( SALOME_VTKPrs* prs )
   {
     aProp->SetLineWidth( GetWidth() );
   }
-    
+
   while ( anActor != NULL )
   {
     SALOME_Actor* GActor = SALOME_Actor::SafeDownCast( anActor );
@@ -880,13 +888,15 @@ void GEOM_Displayer::GlobalSelection( const TColStd_MapOfInteger& theModes,
   aSel->ClearIndex();
     
   aSel->ClearFilters();
+
+  if ( theModes.Contains( GEOM_ALLOBJECTS ) )
+    return;
+
   Handle(SALOME_Filter) aFilter;
   if ( theModes.Extent() == 1 )
   {
     int aMode = TColStd_MapIteratorOfMapOfInteger( theModes ).Key();
-    int aTopAbsMode = getTopAbsMode( aMode );
+    aFilter = getFilter( aMode );
-    if ( aTopAbsMode != -1 )
-      aFilter = getFilter( aMode );
   }
   else if ( theModes.Extent() > 1 )
   {
@@ -933,15 +943,15 @@ void GEOM_Displayer::LocalSelection( const SALOME_ListIO& theIOList, const int t
 void GEOM_Displayer::BeforeDisplay( SALOME_View* v, const SALOME_OCCViewType& )
 {
   OCCViewer_ViewFrame* vf = dynamic_cast<OCCViewer_ViewFrame*>( v );
-  if ( !vf )
+  if ( vf )
-    return;
+  {
-
+    Handle(AIS_InteractiveContext) ic = vf->getViewer()->getAISContext();
-  Handle(AIS_InteractiveContext) ic = vf->getViewer()->getAISContext();
+    if ( !ic.IsNull() )
-  if ( ic.IsNull() )
+    {
-    return;
+      if ( ic->HasOpenedContext() )
-
+      ic->CloseAllContexts();
-  if ( ic->HasOpenedContext() )
+    }
-    ic->CloseAllContexts();
+  }
 }
 
 void GEOM_Displayer::AfterDisplay( SALOME_View*, const SALOME_OCCViewType& )

src/GEOMGUI/GEOM_Displayer.h

@@ -40,7 +40,10 @@
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(GEOM_Gen)
 
-#define GEOM_PREVIEW -2 // Definition for preview selection 
+#define GEOM_ALLOBJECTS -1 // Selection of all objects is activated
+#define GEOM_PREVIEW    -2 // Definition for preview selection
+#define GEOM_ALLSHAPES  -3 // Selection of all shapes is activated
+#define GEOM_ALLGEOM    -4 // Selection of all geom objects is activated
 
 typedef std::list<GEOM::GEOM_Object_ptr> ObjectList;
 
@@ -130,7 +133,7 @@ public:
   /* Activate/Deactivate selection*/
   void         LocalSelection( const Handle(SALOME_InteractiveObject)&, const int );
   void         LocalSelection( const SALOME_ListIO& theIOList, const int );
-  void         GlobalSelection( const int, const bool = false );
+  void         GlobalSelection( const int = GEOM_ALLOBJECTS, const bool = false );
   void         GlobalSelection( const TColStd_MapOfInteger&, const bool = false );
 
   static QAD_ViewFrame* GetActiveView();

src/GEOMGUI/GEOM_icons.po

@@ -483,3 +483,6 @@ msgstr "block_face_2e.png"
 
 msgid "ICON_DLG_QUAD_FACE_4_EDGE"
 msgstr "block_face_4e.png"
+
+msgid "ICON_DLG_GLUE_FACES"
+msgstr "glue.png"

src/GEOMGUI/GEOM_msg_en.po

@@ -1898,3 +1898,35 @@ msgstr "Incorrect parameters for Shape Healing algorithm"
 
 msgid "ShHealOper_ErrorExecution_msg"
 msgstr "Shape Healing algorithm failed"
+
+msgid "GEOM_GLUE_TITLE"
+msgstr "Glue faces"
+
+msgid "GEOM_GLUE"
+msgstr "Glue"
+
+### New object names for RepairGUI ###
+msgid "SEWING_NEW_OBJ_NAME"
+msgstr "Sewing"
+
+msgid "DEVIDE_EDGE_NEW_OBJECT_NAME"
+msgstr "NewObject"
+
+msgid "CLOSE_CONTOUR_NEW_OBJ_NAME"
+msgstr "CloseContour"
+
+msgid "REMOVE_HOLES_NEW_OBJ_NAME"
+msgstr "SupressHoles"
+
+msgid "GLUE_NEW_OBJ_NAME"
+msgstr "Glue"
+
+msgid "REMOVE_INT_WIRES_NEW_OBJ_NAME"
+msgstr "RemoveIntWires"
+
+msgid "PROCESS_SHAPE_NEW_OBJ_NAME"
+msgstr "ProcessShape"
+
+msgid "SUPRESS_FACE_NEW_OBJ_NAME"
+msgstr "SupressFaces"
+###

src/GEOMGUI/GeometryGUI.cxx

@@ -42,6 +42,7 @@
 #include "SALOMEGUI_Desktop.h"
 
 #include "OCCViewer_Viewer3d.h"
+#include "OCCViewer_ViewFrame.h"
 #include "OCCViewer_ViewPort3d.h"
 #include "OCCViewer_Prs.h"
 
@@ -400,11 +401,12 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
   else if( theCommandID == 601 ||   // MENU REPAIR - SEWING
 	   theCommandID == 603 ||   // MENU REPAIR - SUPPRESS FACES
 	   theCommandID == 604 ||   // MENU REPAIR - SUPPRESS HOLE
-     theCommandID == 605 ||   // MENU REPAIR - SHAPE PROCESSING
+           theCommandID == 605 ||   // MENU REPAIR - SHAPE PROCESSING
-     theCommandID == 606 ||   // MENU REPAIR - CLOSE CONTOUR
+           theCommandID == 606 ||   // MENU REPAIR - CLOSE CONTOUR
-     theCommandID == 607 ||   // MENU REPAIR - REMOVE INTERNAL WIRES
+           theCommandID == 607 ||   // MENU REPAIR - REMOVE INTERNAL WIRES
-     theCommandID == 608 ||   // MENU REPAIR - ADD POINT ON EDGE
+           theCommandID == 608 ||   // MENU REPAIR - ADD POINT ON EDGE
-     theCommandID == 609 ) {  // MENU REPAIR - FREE BOUNDARIES
+           theCommandID == 609 ||   // MENU REPAIR - FREE BOUNDARIES
+	   theCommandID == 602 ) {  // MENU REPAIR - GLUE FACES
     library = geomGUI->getLibrary( "libRepairGUI.so" );
   }
   else if( theCommandID == 701  ||  // MENU MEASURE - PROPERTIES
@@ -414,7 +416,7 @@ bool GeometryGUI::OnGUIEvent(int theCommandID, QAD_Desktop* parent)
 	   theCommandID == 7042 ||  // MENU MEASURE - MIN DISTANCE
 	   theCommandID == 705  ||  // MENU MEASURE - TOLERANCE
 	   theCommandID == 706  ||  // MENU MEASURE - WHATIS
-	   theCommandID == 707  ||   // MENU MEASURE - CHECK
+	   theCommandID == 707  ||  // MENU MEASURE - CHECK
 	   theCommandID == 708 ) {  // MENU MEASURE - POINT COORDINATES
     library = geomGUI->getLibrary( "libMeasureGUI.so" );
   }
@@ -970,9 +972,10 @@ bool GeometryGUI::ActiveStudyChanged(QAD_Desktop* parent)
 // function : GeometryGUI::BuildPresentation()
 // purpose  : static
 //=======================================================================
-void GeometryGUI::BuildPresentation(const Handle(SALOME_InteractiveObject)& theIO)
+void GeometryGUI::BuildPresentation( const Handle(SALOME_InteractiveObject)& theIO,
+                                     QAD_ViewFrame* theViewFrame )
 {
-  GEOM_Displayer().Display( theIO, false );
+  GEOM_Displayer().Display( theIO, false, theViewFrame );
 }
 
 void GeometryGUI::SupportedViewType(int* buffer, int bufferSize)

src/GEOMGUI/GeometryGUI.h

@@ -90,7 +90,8 @@ public:
   virtual bool SetSettings(QAD_Desktop* parent);
   virtual bool ActiveStudyChanged(QAD_Desktop* parent);
   virtual void Deactivate();
-  virtual void BuildPresentation(const Handle(SALOME_InteractiveObject)&);
+  virtual void BuildPresentation( const Handle(SALOME_InteractiveObject)&,
+                                  QAD_ViewFrame*  = 0 );
   virtual void SupportedViewType (int* buffer, int bufferSize);
   virtual void DefinePopup(QString & theContext, QString & theParent, QString & theObject);
   virtual bool CustomPopup(QAD_Desktop* parent, QPopupMenu* popup, const QString& theContext,

src/GEOMGUI/GeometryGUI_Swig.cxx

@@ -37,6 +37,7 @@
 #include "SALOMEGUI_ImportOperation.h"
 
 #include "OCCViewer_Viewer3d.h"
+#include "OCCViewer_ViewFrame.h"
 #include <TopExp_Explorer.hxx>
 #include <TopTools_MapOfShape.hxx>
 #include <TopTools_ListOfShape.hxx>

src/GEOMImpl/GEOMImpl_Block6Explorer.cxx

@@ -10,6 +10,7 @@ using namespace std;
 #include <BRep_TFace.hxx>
 #include <BRepTools.hxx>
 #include <BRepTools_WireExplorer.hxx>
+#include <BRepOffsetAPI_ThruSections.hxx>
 #include <BRepBuilderAPI_MakeEdge.hxx>
 #include <BRepBuilderAPI_MakeWire.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
@@ -37,6 +38,7 @@ using namespace std;
 #include <gp_Pnt.hxx>
 #include <TColgp_Array1OfPnt.hxx>
 
+#include <StdFail_NotDone.hxx>
 #include <Standard_NullObject.hxx>
 #include <Standard_TypeMismatch.hxx>
 #include <Standard_ConstructionError.hxx>
@@ -309,7 +311,12 @@ TopoDS_Shape GEOMImpl_Block6Explorer::GetFace (const Standard_Integer theFaceID,
     if (!MW.IsDone()) {
       Standard_ConstructionError::Raise("Wire construction failed");
     }
-    MakeFace(MW, Standard_False, myFaces(theFaceID));
+    TopoDS_Shape aFace;
+    MakeFace(MW, Standard_False, aFace);
+    if (aFace.IsNull()) {
+      Standard_ConstructionError::Raise("Face construction failed");
+    }
+    myFaces(theFaceID) = aFace;
   }
 
   return myFaces(theFaceID);
@@ -946,6 +953,64 @@ void GEOMImpl_Block6Explorer::InitByTwoFaces (const TopoDS_Shape& theFace1,
     if (s_min == -1) nb = mod4(nb - 1);
     myEdges(edge_id(2, i)) = anEdges2(nb);
   }
+
+  // 4. Generate side surface
+  if (!aWire1.Closed() || !aWire2.Closed()) {
+    // BRepOffsetAPI_ThruSections is not applicable on not closed wires
+    GetFace(3, Standard_True);
+    GetFace(4, Standard_True);
+    GetFace(5, Standard_True);
+    GetFace(6, Standard_True);
+  } else {
+    // try to build faces on native surfaces of edges or planar
+    Standard_Boolean tryThru = Standard_False;
+    for (Standard_Integer i = 3; i <= 6 && !tryThru; i++) {
+      Standard_Boolean doMake = Standard_True;
+      TopoDS_Shape E1 = GetEdge(edge_id(i, 1), doMake);
+      TopoDS_Shape E2 = GetEdge(edge_id(i, 2), doMake);
+      TopoDS_Shape E3 = GetEdge(edge_id(i, 3), doMake);
+      TopoDS_Shape E4 = GetEdge(edge_id(i, 4), doMake);
+
+      BRepBuilderAPI_MakeWire MW (TopoDS::Edge(E1),
+                                  TopoDS::Edge(E2),
+                                  TopoDS::Edge(E3),
+                                  TopoDS::Edge(E4));
+      if (!MW.IsDone()) {
+        Standard_ConstructionError::Raise("Wire construction failed");
+      }
+
+      BRepBuilderAPI_MakeFace MF (MW, Standard_False);
+      if (MF.IsDone()) {
+        myFaces(i) = MF.Shape();
+      } else {
+        tryThru = Standard_True;
+      }
+    }
+
+    // Build side surface by ThruSections algorithm
+    if (tryThru) {
+      BRepOffsetAPI_ThruSections THS;
+      THS.AddWire(TopoDS::Wire(aWire1));
+      THS.AddWire(TopoDS::Wire(aWire2));
+      THS.Build();
+      if (!THS.IsDone()) {
+        StdFail_NotDone::Raise("Side surface generation failed");
+      }
+      for (Standard_Integer i = 1; i <= 4; i++) {
+        // fill face
+        myFaces(i+2) = THS.GeneratedFace(myEdges(i));
+
+        // fill edge
+        Standard_Integer ee = side_edge_id(i);
+        TopTools_IndexedDataMapOfShapeListOfShape MVE;
+        MapShapesAndAncestors(myFaces(i+2), TopAbs_VERTEX, TopAbs_EDGE, MVE);
+        FindEdge(myEdges(ee),
+                 myVertices(vertex_id_edge(ee, 1)),
+                 myVertices(vertex_id_edge(ee, 2)),
+                 MVE);
+      }
+    }
+  }
 }
 
 //=======================================================================
@@ -1006,6 +1071,82 @@ Standard_Boolean GEOMImpl_Block6Explorer::IsSimilarEdges (const TopoDS_Shape& E1
   return Standard_False;
 }
 
+//=======================================================================
+//function : FindEdge
+//purpose  :
+//=======================================================================
+Standard_Integer GEOMImpl_Block6Explorer::FindEdge
+                   (TopoDS_Shape&       theResult,
+                    const TopoDS_Shape& V1,
+                    const TopoDS_Shape& V2,
+                    const TopTools_IndexedDataMapOfShapeListOfShape& MVE,
+                    const Standard_Boolean findAll)
+{
+  Standard_Integer isFound = 0;
+
+  const TopTools_ListOfShape& anEdgesOfV1 = MVE.FindFromKey(V1);
+  const TopTools_ListOfShape& anEdgesOfV2 = MVE.FindFromKey(V2);
+
+  TopTools_ListIteratorOfListOfShape it1 (anEdgesOfV1);
+  for (; it1.More(); it1.Next()) {
+    TopTools_ListIteratorOfListOfShape it2 (anEdgesOfV2);
+    for (; it2.More(); it2.Next()) {
+      if (it1.Value().IsSame(it2.Value())) {
+        isFound++;
+        theResult = it1.Value();
+        if (!findAll) return isFound;
+      }
+    }
+  }
+
+  return isFound;
+}
+
+//=======================================================================
+//function : FindFace
+//purpose  :
+//=======================================================================
+Standard_Integer GEOMImpl_Block6Explorer::FindFace
+                   (TopoDS_Shape&       theResult,
+                    const TopoDS_Shape& V1,
+                    const TopoDS_Shape& V2,
+                    const TopoDS_Shape& V3,
+                    const TopoDS_Shape& V4,
+                    const TopTools_IndexedDataMapOfShapeListOfShape& MVF,
+                    const Standard_Boolean findAll)
+{
+  Standard_Integer isFound = Standard_False;
+
+  const TopTools_ListOfShape& aFacesOfV1 = MVF.FindFromKey(V1);
+  const TopTools_ListOfShape& aFacesOfV2 = MVF.FindFromKey(V2);
+  const TopTools_ListOfShape& aFacesOfV3 = MVF.FindFromKey(V3);
+  const TopTools_ListOfShape& aFacesOfV4 = MVF.FindFromKey(V4);
+
+  TopTools_ListIteratorOfListOfShape it1 (aFacesOfV1);
+  for (; it1.More(); it1.Next()) {
+    TopTools_ListIteratorOfListOfShape it2 (aFacesOfV2);
+    for (; it2.More(); it2.Next()) {
+      if (it1.Value().IsSame(it2.Value())) {
+        TopTools_ListIteratorOfListOfShape it3 (aFacesOfV3);
+        for (; it3.More(); it3.Next()) {
+          if (it1.Value().IsSame(it3.Value())) {
+            TopTools_ListIteratorOfListOfShape it4 (aFacesOfV4);
+            for (; it4.More(); it4.Next()) {
+              if (it1.Value().IsSame(it4.Value())) {
+                isFound++;
+                theResult = it1.Value();
+                if (!findAll) return isFound;
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+
+  return isFound;
+}
+
 //=======================================================================
 //function : MakeFace
 //purpose  :
@@ -1018,9 +1159,11 @@ void GEOMImpl_Block6Explorer::MakeFace (const TopoDS_Wire&     theWire,
   BRepBuilderAPI_MakeFace MK (theWire, isPlanarWanted);
   if (MK.IsDone()) {
     theResult = MK.Shape();
+    return;
+  }
 
-  } else if (!isPlanarWanted) {
+  // try to construct filling surface
-    // try to construct filling surface
+  if (!isPlanarWanted) {
     BRepOffsetAPI_MakeFilling MF;
 
     Standard_Integer nbEdges = 0;
@@ -1030,44 +1173,41 @@ void GEOMImpl_Block6Explorer::MakeFace (const TopoDS_Wire&     theWire,
     }
 
     MF.Build();
-    if (!MF.IsDone()) {
+    if (MF.IsDone()) {
-      Standard_ConstructionError::Raise("Building of face on the given wire failed");
+      // Result of filling
-    }
+      TopoDS_Shape aFace = MF.Shape();
 
-    // Result of filling
+      // Update tolerance
-    TopoDS_Shape aFace = MF.Shape();
+      Standard_Real aTol = MF.G0Error();
 
-    // Update tolerance
+      TColgp_Array1OfPnt aPnts (1,nbEdges); // points of the given wire
-    Standard_Real aTol = MF.G0Error();
+      aWE = BRepTools_WireExplorer(theWire);
-
+      Standard_Integer vi = 1;
-    TColgp_Array1OfPnt aPnts (1,nbEdges); // points of the given wire
+      for (; aWE.More() && vi <= nbEdges; aWE.Next(), vi++) {
-    aWE = BRepTools_WireExplorer(theWire);
+        aPnts(vi) = BRep_Tool::Pnt(TopoDS::Vertex(aWE.CurrentVertex()));
-    Standard_Integer vi = 1;
-    for (; aWE.More() && vi <= nbEdges; aWE.Next(), vi++) {
-      aPnts(vi) = BRep_Tool::Pnt(TopoDS::Vertex(aWE.CurrentVertex()));
-    }
-
-    // Find maximum deviation in vertices
-    TopExp_Explorer exp (aFace, TopAbs_VERTEX);
-    TopTools_MapOfShape mapShape;
-    for (; exp.More(); exp.Next()) {
-      if (mapShape.Add(exp.Current())) {
-        TopoDS_Vertex aV = TopoDS::Vertex(exp.Current());
-        Standard_Real aTolV = BRep_Tool::Tolerance(aV);
-        gp_Pnt aP = BRep_Tool::Pnt(aV);
-        Standard_Real min_dist = aP.Distance(aPnts(1));
-        for (vi = 2; vi <= nbEdges; vi++) {
-          min_dist = Min(min_dist, aP.Distance(aPnts(vi)));
-        }
-        aTol = Max(aTol, min_dist);
       }
-    }
 
-    if ((*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance() < aTol) {
+      // Find maximum deviation in vertices
-      (*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance(aTol);
+      TopExp_Explorer exp (aFace, TopAbs_VERTEX);
+      TopTools_MapOfShape mapShape;
+      for (; exp.More(); exp.Next()) {
+        if (mapShape.Add(exp.Current())) {
+          TopoDS_Vertex aV = TopoDS::Vertex(exp.Current());
+          Standard_Real aTolV = BRep_Tool::Tolerance(aV);
+          gp_Pnt aP = BRep_Tool::Pnt(aV);
+          Standard_Real min_dist = aP.Distance(aPnts(1));
+          for (vi = 2; vi <= nbEdges; vi++) {
+            min_dist = Min(min_dist, aP.Distance(aPnts(vi)));
+          }
+          aTol = Max(aTol, aTolV);
+          aTol = Max(aTol, min_dist);
+        }
+      }
+
+      if ((*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance() < aTol) {
+        (*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance(aTol);
+      }
+      theResult = aFace;
     }
-    theResult = aFace;
-  } else {
-    Standard_ConstructionError::Raise("Building of face on the given wire failed");
   }
 }

src/GEOMImpl/GEOMImpl_Block6Explorer.hxx

@@ -176,6 +176,22 @@ class GEOMImpl_Block6Explorer
   static Standard_Boolean IsSimilarEdges (const TopoDS_Shape& E1, 
                                           const TopoDS_Shape& E2);
 
+  static Standard_Integer FindEdge (TopoDS_Shape&       theResult,
+                                    const TopoDS_Shape& V1,
+                                    const TopoDS_Shape& V2,
+                                    const TopTools_IndexedDataMapOfShapeListOfShape& MVE,
+                                    const Standard_Boolean findAll = Standard_False);
+  // returns number of found edges
+
+  static Standard_Integer FindFace (TopoDS_Shape&       theResult,
+                                    const TopoDS_Shape& V1,
+                                    const TopoDS_Shape& V2,
+                                    const TopoDS_Shape& V3,
+                                    const TopoDS_Shape& V4,
+                                    const TopTools_IndexedDataMapOfShapeListOfShape& MVF,
+                                    const Standard_Boolean findAll = Standard_False);
+  // returns number of found faces
+
   static void MakeFace (const TopoDS_Wire&     theWire,
                         const Standard_Boolean isPlanarWanted,
                         TopoDS_Shape&          theResult);

src/GEOMImpl/GEOMImpl_BlockDriver.cxx

@@ -13,6 +13,7 @@ using namespace std;
 #include "GEOM_Function.hxx"
 
 #include "ShHealOper_Sewing.hxx"
+#include "NMTAlgo_Splitter1.hxx"
 
 #include <TNaming_CopyShape.hxx>
 
@@ -31,7 +32,6 @@ using namespace std;
 #include <BRepClass3d_SolidClassifier.hxx>
 #include <BRepExtrema_ExtPF.hxx>
 #include <BRepExtrema_DistShapeShape.hxx>
-#include <BRepOffsetAPI_ThruSections.hxx>
 
 #include <TopAbs.hxx>
 #include <TopoDS.hxx>
@@ -103,8 +103,12 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
   Standard_Real prec = Precision::Confusion();
 
   Standard_Integer aNbSub = 0;
-  if (aType == BLOCK_FACE_TWO_EDGES ||
+  if (aType == BLOCK_COMPOUND_GLUE) {
-      aType == BLOCK_TWO_FACES) {
+
+    aNbSub = 1;
+
+  } else if (aType == BLOCK_FACE_TWO_EDGES ||
+             aType == BLOCK_TWO_FACES) {
 
     aNbSub = 2;
 
@@ -210,6 +214,9 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
 
       // try to build face on the wire
       GEOMImpl_Block6Explorer::MakeFace(aWire, Standard_False, aShape);
+      if (aShape.IsNull()) {
+        Standard_ConstructionError::Raise("Face construction failed");
+      }
 
     } else if (aType == BLOCK_FACE_TWO_EDGES) {
 
@@ -265,6 +272,9 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
 
       // try to build face on the wire
       GEOMImpl_Block6Explorer::MakeFace(MW, Standard_False, aShape);
+      if (aShape.IsNull()) {
+        Standard_ConstructionError::Raise("Face construction failed");
+      }
 
     } else if (aType == BLOCK_FACE_FOUR_PNT) {
 
@@ -320,6 +330,9 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
 
       // try to build face on the wire
       GEOMImpl_Block6Explorer::MakeFace(aMkPoly, Standard_False, aShape);
+      if (aShape.IsNull()) {
+        Standard_ConstructionError::Raise("Face construction failed");
+      }
 
     } else if (aType == BLOCK_SIX_FACES || aType == BLOCK_TWO_FACES) {
 
@@ -357,33 +370,16 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
           Standard_ConstructionError::Raise("A face for the block has more than one wire");
         }
 
-        if (aWire1.Closed() && aWire2.Closed()) {
+        GEOMImpl_Block6Explorer aBlockTool;
-          // Build side surface by ThruSections algorithm
+        aBlockTool.InitByTwoFaces(anArgs(1), anArgs(2));
-          BRepOffsetAPI_ThruSections THS;
-          THS.AddWire(TopoDS::Wire(aWire1));
-          THS.AddWire(TopoDS::Wire(aWire2));
-          THS.Build();
-          if (!THS.IsDone()) {
-            StdFail_NotDone::Raise("Side surface generation failed");
-          }
-          TopoDS_Shape aShell = THS.Shape();
 
-          Glue.Add(anArgs(1));
+        // Construct the linking faces and add them in the gluing tool
-          Glue.Add(aShell);
+        Glue.Add(anArgs(1));
-          Glue.Add(anArgs(2));
+        Glue.Add(aBlockTool.GetFace(3, Standard_True));
-
+        Glue.Add(aBlockTool.GetFace(4, Standard_True));
-        } else {
+        Glue.Add(aBlockTool.GetFace(5, Standard_True));
-          GEOMImpl_Block6Explorer aBlockTool;
+        Glue.Add(aBlockTool.GetFace(6, Standard_True));
-          aBlockTool.InitByTwoFaces(anArgs(1), anArgs(2));
+        Glue.Add(anArgs(2));
-
-          // Construct the linking faces and add them in the gluing tool
-          Glue.Add(anArgs(1));
-          Glue.Add(aBlockTool.GetFace(3, Standard_True));
-          Glue.Add(aBlockTool.GetFace(4, Standard_True));
-          Glue.Add(aBlockTool.GetFace(5, Standard_True));
-          Glue.Add(aBlockTool.GetFace(6, Standard_True));
-          Glue.Add(anArgs(2));
-        }
       }
 
       TopExp_Explorer exp (Glue.Shells(), TopAbs_SHELL);
@@ -411,11 +407,10 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
               aTol = aToler;
           }
         }
-	ShHealOper_Sewing aHealer (Shell, aTol);
+        ShHealOper_Sewing aHealer (Shell, aTol);
-	Standard_Boolean aResult = aHealer.Perform();
+        if (aHealer.Perform())
-	if (aHealer.Perform())
           aShape = aHealer.GetResultShape();
-	else
+        else
           Standard_ConstructionError::Raise
             ("Impossible to build a connected shell on the given faces");
       }
@@ -439,6 +434,25 @@ Standard_Integer GEOMImpl_BlockDriver::Execute(TFunction_Logbook& log) const
       aShape = Sol;
       BRepLib::SameParameter(aShape, 1.E-5, Standard_True);
 
+    } else if (aType == BLOCK_COMPOUND_GLUE) {
+
+      // Make blocks compound from a compound
+      if (anArgs(1).ShapeType() != TopAbs_COMPOUND &&
+          anArgs(2).ShapeType() != TopAbs_COMPSOLID) {
+        Standard_TypeMismatch::Raise("Not a compound given");
+      }
+
+      TopoDS_Shape aCompound = anArgs(1);
+
+      // Glue coincident faces and edges (with Partition algorithm).
+      NMTAlgo_Splitter1 PS;
+      PS.AddShape(aCompound);
+      PS.Compute();
+      PS.SetRemoveWebs(Standard_False);
+//      PS.Build(aCompound.ShapeType());
+      PS.Build(TopAbs_SOLID);
+
+      aShape = PS.Shape();
     } else {
     }
 
@@ -880,10 +894,10 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_BlockDriver_Type_()
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_BlockDriver",
-			                                 sizeof(GEOMImpl_BlockDriver),
+                                                         sizeof(GEOMImpl_BlockDriver),
-			                                 1,
+                                                         1,
-			                                 (Standard_Address)_Ancestors,
+                                                         (Standard_Address)_Ancestors,
-			                                 (Standard_Address)NULL);
+                                                         (Standard_Address)NULL);
 
   return _aType;
 }

src/GEOMImpl/GEOMImpl_ChamferDriver.cxx

@@ -7,20 +7,20 @@ using namespace std;
 #include "GEOM_Function.hxx"
 #include "GEOMImpl_Block6Explorer.hxx"
 
-#include <BRepFilletAPI_MakeChamfer.hxx>
 #include <BRep_Tool.hxx>
 #include <BRepTools.hxx>
+#include <BRepFilletAPI_MakeChamfer.hxx>
 
 #include <TopAbs.hxx>
 #include <TopoDS.hxx>
-#include <TopoDS_Shape.hxx>
 #include <TopoDS_Edge.hxx>
 #include <TopoDS_Face.hxx>
+#include <TopoDS_Shape.hxx>
 #include <TopoDS_Iterator.hxx>
 #include <TopExp.hxx>
 #include <TopExp_Explorer.hxx>
-#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 #include <TopTools_MapOfShape.hxx>
+#include <TopTools_IndexedDataMapOfShapeListOfShape.hxx>
 
 #include <Precision.hxx>
 #include <gp_Pnt.hxx>
@@ -46,7 +46,7 @@ GEOMImpl_ChamferDriver::GEOMImpl_ChamferDriver()
 }
 
 //=======================================================================
-//function : Execute
+//function : isGoodForChamfer
 //purpose  :
 //=======================================================================
 static Standard_Boolean isGoodForChamfer (const TopoDS_Shape& theShape)
@@ -90,10 +90,11 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
   Handle(GEOM_Function) aRefShape = aCI.GetShape();
   TopoDS_Shape aShapeBase = aRefShape->GetValue();
 
-  // to do: check the shape type.
+  // Check the shape type. It have to be shell
-  // It have to be shell, or solid, or compsolid, or compound of these shapes
+  // or solid, or compsolid, or compound of these shapes.
   if (!isGoodForChamfer(aShapeBase)) {
-    StdFail_NotDone::Raise("Wrong shape. Must be shell or solid, or compsolid or compound of these shapes");
+    StdFail_NotDone::Raise
+      ("Wrong shape. Must be shell or solid, or compsolid or compound of these shapes");
   }
 
   BRepFilletAPI_MakeChamfer fill (aShapeBase);
@@ -129,7 +130,7 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
 
       // find edges of the first face, common with the second face
       TopExp_Explorer Exp (aFace1, TopAbs_EDGE);
-      for (Exp; Exp.More(); Exp.Next()) {
+      for (; Exp.More(); Exp.Next()) {
         if (aMap.Contains(Exp.Current())) {
           TopoDS_Edge E = TopoDS::Edge(Exp.Current());
           if (!BRepTools::IsReallyClosed(E, F) && !BRep_Tool::Degenerated(E))
@@ -154,7 +155,7 @@ Standard_Integer GEOMImpl_ChamferDriver::Execute(TFunction_Logbook& log) const
           (aShapeBase, aCI.GetFace(ind), aShapeFace)) {
         TopoDS_Face F = TopoDS::Face(aShapeFace);
         TopExp_Explorer Exp (F, TopAbs_EDGE);
-        for (Exp; Exp.More(); Exp.Next()) {
+        for (; Exp.More(); Exp.Next()) {
           if (!aMap.Contains(Exp.Current())) {
             TopoDS_Edge E = TopoDS::Edge(Exp.Current());
             if (!BRepTools::IsReallyClosed(E, F) &&

src/GEOMImpl/GEOMImpl_FilletDriver.cxx

@@ -23,7 +23,7 @@ using namespace std;
 //=======================================================================
 //function : GetID
 //purpose  :
-//======================================================================= 
+//=======================================================================
 const Standard_GUID& GEOMImpl_FilletDriver::GetID()
 {
   static Standard_GUID aFilletDriver("FF1BBB41-5D14-4df2-980B-3A668264EA16");
@@ -33,7 +33,7 @@ const Standard_GUID& GEOMImpl_FilletDriver::GetID()
 
 //=======================================================================
 //function : GEOMImpl_FilletDriver
-//purpose  : 
+//purpose  :
 //=======================================================================
 GEOMImpl_FilletDriver::GEOMImpl_FilletDriver()
 {
@@ -42,10 +42,10 @@ GEOMImpl_FilletDriver::GEOMImpl_FilletDriver()
 //=======================================================================
 //function : Execute
 //purpose  :
-//======================================================================= 
+//=======================================================================
 Standard_Integer GEOMImpl_FilletDriver::Execute(TFunction_Logbook& log) const
 {
-  if (Label().IsNull()) return 0;    
+  if (Label().IsNull()) return 0;
   Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
 
   GEOMImpl_IFillet aCI (aFunction);
@@ -59,7 +59,7 @@ Standard_Integer GEOMImpl_FilletDriver::Execute(TFunction_Logbook& log) const
 
   if (aType == FILLET_SHAPE_ALL) {
     TopExp_Explorer Exp (aShapeBase, TopAbs_EDGE);
-    for (Exp; Exp.More(); Exp.Next()) {
+    for (; Exp.More(); Exp.Next()) {
       TopoDS_Edge E = TopoDS::Edge(Exp.Current());
       fill.Add(E);
     }
@@ -81,7 +81,7 @@ Standard_Integer GEOMImpl_FilletDriver::Execute(TFunction_Logbook& log) const
       if (GEOMImpl_ILocalOperations::GetSubShape
           (aShapeBase, aCI.GetFace(ind), aShapeFace)) {
         TopExp_Explorer Exp (aShapeFace, TopAbs_EDGE);
-        for (Exp; Exp.More(); Exp.Next()) {
+        for (; Exp.More(); Exp.Next()) {
           fill.Add(TopoDS::Edge(Exp.Current()));
         }
       }
@@ -108,26 +108,26 @@ Standard_Integer GEOMImpl_FilletDriver::Execute(TFunction_Logbook& log) const
 
   aFunction->SetValue(aShape);
 
-  log.SetTouched(Label()); 
+  log.SetTouched(Label());
 
-  return 1;    
+  return 1;
 }
 
 
 //=======================================================================
 //function :  GEOMImpl_FilletDriver_Type_
 //purpose  :
-//======================================================================= 
+//=======================================================================
 Standard_EXPORT Handle_Standard_Type& GEOMImpl_FilletDriver_Type_()
 {
 
   static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
   if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared); 
+  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
   if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
+
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_FilletDriver",
@@ -142,7 +142,7 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_FilletDriver_Type_()
 //=======================================================================
 //function : DownCast
 //purpose  :
-//======================================================================= 
+//=======================================================================
 const Handle(GEOMImpl_FilletDriver) Handle(GEOMImpl_FilletDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
 {
   Handle(GEOMImpl_FilletDriver) _anOtherObject;

src/GEOMImpl/GEOMImpl_FillingDriver.cxx

@@ -1,125 +1,140 @@
 
 using namespace std;
+
 #include "GEOMImpl_FillingDriver.hxx"
 #include "GEOM_Function.hxx"
 #include "GEOMImpl_IFilling.hxx"
 #include "GEOMImpl_Types.hxx"
+
+#include <BRep_Tool.hxx>
+#include <BRepAlgo.hxx>
 #include <BRepBuilderAPI_MakeFace.hxx>
-#include <TopoDS_Shape.hxx>
+
-#include <TopExp_Explorer.hxx>
 #include <TopAbs.hxx>
 #include <TopoDS.hxx>
-#include <BRep_Tool.hxx>
+#include <TopoDS_Shape.hxx>
-#include <Geom_Surface.hxx>
+#include <TopExp_Explorer.hxx>
+
 #include <Geom_Curve.hxx>
+#include <Geom_Surface.hxx>
 #include <Geom_TrimmedCurve.hxx>
 #include <Geom_BSplineSurface.hxx>
-#include <GeomFill_SectionGenerator.hxx>
 #include <GeomFill_Line.hxx>
 #include <GeomFill_AppSurf.hxx>
+#include <GeomFill_SectionGenerator.hxx>
+
 #include <Precision.hxx>
-#include <BRepAlgo.hxx>
+#include <Standard_ConstructionError.hxx>
 
 //=======================================================================
 //function : GetID
 //purpose  :
-//======================================================================= 
+//=======================================================================
 const Standard_GUID& GEOMImpl_FillingDriver::GetID()
 {
-  static Standard_GUID aFillingDriver("FF1BBB62-5D14-4df2-980B-3A668264EA16");
+  static Standard_GUID aFillingDriver ("FF1BBB62-5D14-4df2-980B-3A668264EA16");
-  return aFillingDriver; 
+  return aFillingDriver;
 }
 
 
 //=======================================================================
 //function : GEOMImpl_FillingDriver
-//purpose  : 
+//purpose  :
 //=======================================================================
 
-GEOMImpl_FillingDriver::GEOMImpl_FillingDriver() 
+GEOMImpl_FillingDriver::GEOMImpl_FillingDriver()
 {
 }
 
 //=======================================================================
 //function : Execute
 //purpose  :
-//======================================================================= 
+//=======================================================================
 Standard_Integer GEOMImpl_FillingDriver::Execute(TFunction_Logbook& log) const
 {
   if (Label().IsNull()) return 0;
-  Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); 
+  Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label());
-  if(aFunction.IsNull()) return 0;
+  if (aFunction.IsNull()) return 0;
 
-  if(aFunction->GetType() != BASIC_FILLING) return 0;
+  if (aFunction->GetType() != BASIC_FILLING) return 0;
 
-  GEOMImpl_IFilling IF(aFunction);
+  GEOMImpl_IFilling IF (aFunction);
   Handle(GEOM_Function) aShapeFunction = IF.GetShape();
-  if(aShapeFunction.IsNull()) return 0;
+  if (aShapeFunction.IsNull()) return 0;
-  TopoDS_Shape aShape = aShapeFunction->GetValue() ;
+  TopoDS_Shape aShape = aShapeFunction->GetValue();
-  if( aShape.IsNull() || aShape.ShapeType() != TopAbs_COMPOUND ) return 0;
+  if (aShape.IsNull() || aShape.ShapeType() != TopAbs_COMPOUND) return 0;
 
   Standard_Integer mindeg = IF.GetMinDeg();
   Standard_Integer maxdeg = IF.GetMaxDeg();
   Standard_Real tol3d = IF.GetTol2D();
   Standard_Real tol2d = IF.GetTol3D();
   Standard_Integer nbiter = IF.GetNbIter();
-  
+
+  if (mindeg > maxdeg) {
+    Standard_RangeError::Raise("Minimal degree can not be more than maximal degree");
+  }
+
   /* we verify the contents of the shape */
-  TopExp_Explorer Ex ;
+  TopExp_Explorer Ex;
-  TopoDS_Shape Scurrent ;	
+  TopoDS_Shape Scurrent;
-  Standard_Real First, Last ;
+  Standard_Real First, Last;
-  Handle(Geom_Curve) C ;
+  Handle(Geom_Curve) C;
-  GeomFill_SectionGenerator Section ;
+  GeomFill_SectionGenerator Section;
-  
+
-  Standard_Integer i = 0 ;
+  Standard_Integer i = 0;
-  for(Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
+  for (Ex.Init(aShape, TopAbs_EDGE); Ex.More(); Ex.Next()) {
     Scurrent = Ex.Current() ;
-    if( Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE) return 0; 
+    if (Scurrent.IsNull() || Scurrent.ShapeType() != TopAbs_EDGE) return 0;
     C = BRep_Tool::Curve(TopoDS::Edge(Scurrent), First, Last);
     C = new Geom_TrimmedCurve(C, First, Last);
-    Section.AddCurve(C) ;
+    Section.AddCurve(C);
-    i++ ;
+    i++;
   }
-    
+
   /* a 'tolerance' is used to compare 2 knots : see GeomFill_Generator.cdl */
-  Section.Perform( Precision::Confusion() ) ;
+  Section.Perform(Precision::Confusion());
-  Handle(GeomFill_Line) Line = new GeomFill_Line(i) ;
+  Handle(GeomFill_Line) Line = new GeomFill_Line(i);
-  
+
-  GeomFill_AppSurf App(mindeg, maxdeg, tol3d, tol2d, nbiter) ; /* user parameters */
+  GeomFill_AppSurf App (mindeg, maxdeg, tol3d, tol2d, nbiter); /* user parameters */
-  App.Perform(Line, Section) ;
+  App.Perform(Line, Section);
-  
+
   if (!App.IsDone()) return 0;
   Standard_Integer UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots;
-  App.SurfShape(UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots);	
+  App.SurfShape(UDegree, VDegree, NbUPoles, NbVPoles, NbUKnots, NbVKnots);
-  Handle(Geom_BSplineSurface) GBS = new Geom_BSplineSurface(App.SurfPoles(), App.SurfWeights(), App.SurfUKnots(), App.SurfVKnots(), App.SurfUMults(), App.SurfVMults(), App.UDegree(), App.VDegree());
+  Handle(Geom_BSplineSurface) GBS = new Geom_BSplineSurface
-    
+    (App.SurfPoles(), App.SurfWeights(), App.SurfUKnots(), App.SurfVKnots(),
-  if( GBS.IsNull() ) return 0;
+     App.SurfUMults(), App.SurfVMults(), App.UDegree(), App.VDegree());
-  aShape  = BRepBuilderAPI_MakeFace(GBS) ;    
+
-  
+  if (GBS.IsNull()) return 0;
+  aShape = BRepBuilderAPI_MakeFace(GBS);
+
   /* We test the validity of resulting shape */
-  if( !BRepAlgo::IsValid((aShape)) )  return 0;
+  if (!BRepAlgo::IsValid((aShape))) {
-  
+    Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result");
-  aFunction->SetValue(aShape);   
+    return 0;
+  }
+
+  aFunction->SetValue(aShape);
 
   log.SetTouched(Label());
-  return 1;    
+  return 1;
 }
 
 
 //=======================================================================
 //function :  GEOMImpl_FillingDriver_Type_
 //purpose  :
-//======================================================================= 
+//=======================================================================
 Standard_EXPORT Handle_Standard_Type& GEOMImpl_FillingDriver_Type_()
 {
 
   static Handle_Standard_Type aType1 = STANDARD_TYPE(TFunction_Driver);
   if ( aType1.IsNull()) aType1 = STANDARD_TYPE(TFunction_Driver);
   static Handle_Standard_Type aType2 = STANDARD_TYPE(MMgt_TShared);
-  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared); 
+  if ( aType2.IsNull()) aType2 = STANDARD_TYPE(MMgt_TShared);
   static Handle_Standard_Type aType3 = STANDARD_TYPE(Standard_Transient);
   if ( aType3.IsNull()) aType3 = STANDARD_TYPE(Standard_Transient);
- 
+
 
   static Handle_Standard_Transient _Ancestors[]= {aType1,aType2,aType3,NULL};
   static Handle_Standard_Type _aType = new Standard_Type("GEOMImpl_FillingDriver",
@@ -134,7 +149,7 @@ Standard_EXPORT Handle_Standard_Type& GEOMImpl_FillingDriver_Type_()
 //=======================================================================
 //function : DownCast
 //purpose  :
-//======================================================================= 
+//=======================================================================
 
 const Handle(GEOMImpl_FillingDriver) Handle(GEOMImpl_FillingDriver)::DownCast(const Handle(Standard_Transient)& AnObject)
 {