From 6101c761432c310cdbc39f0a9715dcc343ac77fd Mon Sep 17 00:00:00 2001 From: admin Date: Fri, 17 Dec 2004 11:18:33 +0000 Subject: [PATCH] Merge with OCC-V2_1_0_deb --- doc/salome/gui/GEOM/blocks.htm | 54 +- .../GEOM/changing_displaying_parameters.htm | 83 +- doc/salome/gui/GEOM/cshdat_robohelp.htm | 10 +- doc/salome/gui/GEOM/cshdat_webhelp.htm | 4 +- doc/salome/gui/GEOM/default.css | 310 ++--- doc/salome/gui/GEOM/default_ns.css | 40 +- doc/salome/gui/GEOM/ehelp.xml | 10 + doc/salome/gui/GEOM/ehlpdhtm.js | 1214 ++++++++++------- .../gui/GEOM/files/introduction_to_geom.htm | 69 +- .../files/salome2_sp3_basicgui_functions.htm | 466 +++---- .../salome2_sp3_booleangui_functions.htm | 133 +- .../files/salome2_sp3_buildgui_functions.htm | 129 +- .../salome2_sp3_displaygui_functions.htm | 81 +- .../salome2_sp3_generationgui_functions.htm | 144 +- .../salome2_sp3_geomtoolsgui_functions.htm | 71 +- .../salome2_sp3_measuregui_functions.htm | 170 +-- .../salome2_sp3_operationgui_functions.htm | 275 ++-- .../salome2_sp3_primitivegui_functions.htm | 161 +-- .../files/salome2_sp3_repairgui_functions.htm | 485 ++++--- ...alome2_sp3_transformationgui_functions.htm | 308 +++-- doc/salome/gui/GEOM/geom.htm | 139 ++ doc/salome/gui/GEOM/geom.log | 476 +++++++ doc/salome/gui/GEOM/geom_csh.htm | 106 ++ doc/salome/gui/GEOM/geom_rhc.htm | 106 ++ doc/salome/gui/GEOM/image221.jpg | Bin 0 -> 12696 bytes doc/salome/gui/GEOM/image222.jpg | Bin 0 -> 13381 bytes doc/salome/gui/GEOM/image223.jpg | Bin 0 -> 12992 bytes doc/salome/gui/GEOM/image224.jpg | Bin 0 -> 13926 bytes doc/salome/gui/GEOM/image225.jpg | Bin 0 -> 13543 bytes doc/salome/gui/GEOM/image226.jpg | Bin 0 -> 15066 bytes doc/salome/gui/GEOM/image227.jpg | Bin 0 -> 14432 bytes doc/salome/gui/GEOM/image228.jpg | Bin 0 -> 12578 bytes doc/salome/gui/GEOM/image229.jpg | Bin 0 -> 12042 bytes doc/salome/gui/GEOM/image230.jpg | Bin 0 -> 12888 bytes doc/salome/gui/GEOM/image231.jpg | Bin 0 -> 12493 bytes doc/salome/gui/GEOM/image233.jpg | Bin 0 -> 11376 bytes doc/salome/gui/GEOM/image234.jpg | Bin 0 -> 13014 bytes doc/salome/gui/GEOM/image235.jpg | Bin 0 -> 11389 bytes doc/salome/gui/GEOM/image236.jpg | Bin 0 -> 14574 bytes doc/salome/gui/GEOM/image237.jpg | Bin 0 -> 13535 bytes doc/salome/gui/GEOM/image238.jpg | Bin 0 -> 14133 bytes doc/salome/gui/GEOM/image239.jpg | Bin 0 -> 16510 bytes doc/salome/gui/GEOM/image240.jpg | Bin 0 -> 14340 bytes doc/salome/gui/GEOM/image241.jpg | Bin 0 -> 14291 bytes doc/salome/gui/GEOM/image242.jpg | Bin 0 -> 9261 bytes doc/salome/gui/GEOM/image243.jpg | Bin 0 -> 12109 bytes doc/salome/gui/GEOM/image244.jpg | Bin 0 -> 13191 bytes doc/salome/gui/GEOM/image245.jpg | Bin 0 -> 11258 bytes doc/salome/gui/GEOM/image246.jpg | Bin 0 -> 13145 bytes doc/salome/gui/GEOM/image247.jpg | Bin 0 -> 15459 bytes doc/salome/gui/GEOM/image248.jpg | Bin 0 -> 14906 bytes doc/salome/gui/GEOM/image249.jpg | Bin 0 -> 13366 bytes doc/salome/gui/GEOM/image250.jpg | Bin 0 -> 13950 bytes doc/salome/gui/GEOM/image251.jpg | Bin 0 -> 14433 bytes doc/salome/gui/GEOM/image252.jpg | Bin 0 -> 17788 bytes doc/salome/gui/GEOM/image253.jpg | Bin 0 -> 12988 bytes doc/salome/gui/GEOM/image254.jpg | Bin 0 -> 15156 bytes doc/salome/gui/GEOM/image255.jpg | Bin 0 -> 15145 bytes doc/salome/gui/GEOM/image256.jpg | Bin 0 -> 14278 bytes doc/salome/gui/GEOM/image257.jpg | Bin 0 -> 14556 bytes doc/salome/gui/GEOM/image258.jpg | Bin 0 -> 10302 bytes doc/salome/gui/GEOM/image259.jpg | Bin 0 -> 11339 bytes doc/salome/gui/GEOM/image260.jpg | Bin 0 -> 9346 bytes doc/salome/gui/GEOM/image261.jpg | Bin 0 -> 9566 bytes doc/salome/gui/GEOM/image262.jpg | Bin 0 -> 11480 bytes doc/salome/gui/GEOM/image263.jpg | Bin 0 -> 8481 bytes doc/salome/gui/GEOM/image264.jpg | Bin 0 -> 10052 bytes doc/salome/gui/GEOM/image265.jpg | Bin 0 -> 13626 bytes doc/salome/gui/GEOM/image266.jpg | Bin 0 -> 12516 bytes doc/salome/gui/GEOM/image267.jpg | Bin 0 -> 12666 bytes doc/salome/gui/GEOM/image268.jpg | Bin 0 -> 12708 bytes doc/salome/gui/GEOM/image269.jpg | Bin 0 -> 13118 bytes doc/salome/gui/GEOM/image270.jpg | Bin 0 -> 13289 bytes doc/salome/gui/GEOM/image271.jpg | Bin 0 -> 12548 bytes doc/salome/gui/GEOM/image272.jpg | Bin 0 -> 13310 bytes doc/salome/gui/GEOM/image273.jpg | Bin 0 -> 12706 bytes doc/salome/gui/GEOM/image274.jpg | Bin 0 -> 12961 bytes doc/salome/gui/GEOM/image275.jpg | Bin 0 -> 11643 bytes doc/salome/gui/GEOM/image276.jpg | Bin 0 -> 9985 bytes doc/salome/gui/GEOM/image277.jpg | Bin 0 -> 11571 bytes doc/salome/gui/GEOM/image278.jpg | Bin 0 -> 13102 bytes doc/salome/gui/GEOM/image279.jpg | Bin 0 -> 15226 bytes doc/salome/gui/GEOM/image280.jpg | Bin 0 -> 15180 bytes doc/salome/gui/GEOM/image281.jpg | Bin 0 -> 14398 bytes doc/salome/gui/GEOM/image282.jpg | Bin 0 -> 14897 bytes doc/salome/gui/GEOM/image283.jpg | Bin 0 -> 14994 bytes doc/salome/gui/GEOM/image284.jpg | Bin 0 -> 14063 bytes doc/salome/gui/GEOM/image285.jpg | Bin 0 -> 7504 bytes doc/salome/gui/GEOM/image286.jpg | Bin 0 -> 14002 bytes doc/salome/gui/GEOM/image287.jpg | Bin 0 -> 12366 bytes doc/salome/gui/GEOM/image288.jpg | Bin 0 -> 15251 bytes doc/salome/gui/GEOM/image289.jpg | Bin 0 -> 13516 bytes doc/salome/gui/GEOM/image290.jpg | Bin 0 -> 14626 bytes doc/salome/gui/GEOM/image291.jpg | Bin 0 -> 11450 bytes doc/salome/gui/GEOM/image292.jpg | Bin 0 -> 12912 bytes doc/salome/gui/GEOM/image293.jpg | Bin 0 -> 16335 bytes doc/salome/gui/GEOM/image294.jpg | Bin 0 -> 12981 bytes doc/salome/gui/GEOM/image295.jpg | Bin 0 -> 18252 bytes doc/salome/gui/GEOM/image296.jpg | Bin 0 -> 17683 bytes doc/salome/gui/GEOM/image297.jpg | Bin 0 -> 16645 bytes doc/salome/gui/GEOM/image298.jpg | Bin 0 -> 17987 bytes doc/salome/gui/GEOM/image299.jpg | Bin 0 -> 14312 bytes doc/salome/gui/GEOM/image300.jpg | Bin 0 -> 13896 bytes doc/salome/gui/GEOM/image64.gif | Bin 0 -> 5504 bytes doc/salome/gui/GEOM/newentity_blocks.htm | 173 +-- doc/salome/gui/GEOM/sketcher.htm | 83 +- doc/salome/gui/GEOM/webhelp.cab | Bin 87764 -> 89619 bytes doc/salome/gui/GEOM/webhelp.jar | Bin 132680 -> 134517 bytes doc/salome/gui/GEOM/whcsh_home.htm | 600 ++++++++ doc/salome/gui/GEOM/whcshdata.htm | 87 ++ doc/salome/gui/GEOM/whdata/whftdata.js | 1 + doc/salome/gui/GEOM/whdata/whftdata0.htm | 6 +- doc/salome/gui/GEOM/whdata/whfts.htm | 10 +- doc/salome/gui/GEOM/whdata/whfts.js | 1 + doc/salome/gui/GEOM/whdata/whfwdata.js | 1 + doc/salome/gui/GEOM/whdata/whfwdata0.htm | 630 ++------- doc/salome/gui/GEOM/whdata/whfwdata1.htm | 287 ++++ doc/salome/gui/GEOM/whdata/whfwdata2.htm | 222 +++ doc/salome/gui/GEOM/whdata/whgdata.js | 1 + doc/salome/gui/GEOM/whdata/whgdata0.htm | 4 +- doc/salome/gui/GEOM/whdata/whglo.htm | 4 +- doc/salome/gui/GEOM/whdata/whglo.js | 1 + doc/salome/gui/GEOM/whdata/whidata.js | 1 + doc/salome/gui/GEOM/whdata/whidx.htm | 8 +- doc/salome/gui/GEOM/whdata/whidx.js | 1 + doc/salome/gui/GEOM/whdata/whtdata.js | 6 + doc/salome/gui/GEOM/whdata/whtdata0.htm | 6 +- doc/salome/gui/GEOM/whdata/whtoc.htm | 6 +- doc/salome/gui/GEOM/whdata/whtoc.js | 3 + doc/salome/gui/GEOM/whfbody.htm | 4 +- doc/salome/gui/GEOM/whfdhtml.htm | 4 +- doc/salome/gui/GEOM/whfform.htm | 4 +- doc/salome/gui/GEOM/whfhost.js | 41 +- doc/salome/gui/GEOM/whform.js | 1 + doc/salome/gui/GEOM/whframes.js | 1 + doc/salome/gui/GEOM/whgbody.htm | 4 +- doc/salome/gui/GEOM/whgdata/whlstf0.htm | 16 +- doc/salome/gui/GEOM/whgdata/whlstf1.htm | 16 +- doc/salome/gui/GEOM/whgdata/whlstf2.htm | 14 +- doc/salome/gui/GEOM/whgdata/whlstf3.htm | 18 +- doc/salome/gui/GEOM/whgdata/whlstf4.htm | 16 +- doc/salome/gui/GEOM/whgdata/whlstf5.htm | 16 +- doc/salome/gui/GEOM/whgdata/whlstfl0.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl1.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl10.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl11.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl12.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl13.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl14.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl15.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl16.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl17.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl18.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl19.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl2.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl20.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl21.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl22.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl23.htm | 45 + doc/salome/gui/GEOM/whgdata/whlstfl3.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl4.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl5.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl6.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl7.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl8.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstfl9.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstg0.htm | 117 +- doc/salome/gui/GEOM/whgdata/whlsti0.htm | 11 +- doc/salome/gui/GEOM/whgdata/whlstt0.htm | 11 +- doc/salome/gui/GEOM/whgdata/whlstt1.htm | 11 +- doc/salome/gui/GEOM/whgdata/whlstt2.htm | 11 +- doc/salome/gui/GEOM/whgdata/whlstt3.htm | 11 +- doc/salome/gui/GEOM/whgdata/whlstt4.htm | 11 +- doc/salome/gui/GEOM/whgdata/whnvf30.htm | 7 +- doc/salome/gui/GEOM/whgdata/whnvf31.htm | 7 +- doc/salome/gui/GEOM/whgdata/whnvf32.htm | 7 +- doc/salome/gui/GEOM/whgdata/whnvf33.htm | 7 +- doc/salome/gui/GEOM/whgdata/whnvl31.htm | 38 +- doc/salome/gui/GEOM/whgdata/whnvl32.htm | 59 +- doc/salome/gui/GEOM/whgdata/whnvl33.htm | 9 +- doc/salome/gui/GEOM/whgdata/whnvp30.htm | 6 +- doc/salome/gui/GEOM/whgdata/whnvp31.htm | 6 +- doc/salome/gui/GEOM/whgdata/whnvp32.htm | 7 +- doc/salome/gui/GEOM/whgdata/whnvp33.htm | 6 +- doc/salome/gui/GEOM/whgdata/whnvt30.htm | 13 +- doc/salome/gui/GEOM/whgdata/whnvt31.htm | 11 +- doc/salome/gui/GEOM/whgdata/whnvt32.htm | 11 +- doc/salome/gui/GEOM/whgdata/whnvt33.htm | 11 +- doc/salome/gui/GEOM/whgdef.htm | 4 +- doc/salome/gui/GEOM/whgdhtml.htm | 4 +- doc/salome/gui/GEOM/whghost.js | 68 +- doc/salome/gui/GEOM/whhost.js | 17 +- doc/salome/gui/GEOM/whibody.htm | 18 +- doc/salome/gui/GEOM/whidhtml.htm | 4 +- doc/salome/gui/GEOM/whiform.htm | 4 +- doc/salome/gui/GEOM/whihost.js | 18 +- doc/salome/gui/GEOM/whlang.js | 15 +- doc/salome/gui/GEOM/whmozemu.js | 41 +- doc/salome/gui/GEOM/whmsg.js | 9 +- doc/salome/gui/GEOM/whnjs.htm | 14 +- doc/salome/gui/GEOM/whphost.js | 105 +- doc/salome/gui/GEOM/whproj.htm | 6 +- doc/salome/gui/GEOM/whproj.js | 3 + doc/salome/gui/GEOM/whproj.xml | 4 +- doc/salome/gui/GEOM/whproxy.js | 13 +- doc/salome/gui/GEOM/whres.xml | 28 +- doc/salome/gui/GEOM/whskin_banner.htm | 28 +- doc/salome/gui/GEOM/whskin_blank.htm | 4 +- doc/salome/gui/GEOM/whskin_frmset01.htm | 2 +- doc/salome/gui/GEOM/whskin_frmset010.htm | 4 +- doc/salome/gui/GEOM/whskin_homepage.htm | 139 ++ doc/salome/gui/GEOM/whskin_info.htm | 16 +- doc/salome/gui/GEOM/whskin_mbars.htm | 5 +- doc/salome/gui/GEOM/whskin_papplet.htm | 204 +-- doc/salome/gui/GEOM/whskin_pdhtml.htm | 12 +- doc/salome/gui/GEOM/whskin_pickup.htm | 229 ++++ doc/salome/gui/GEOM/whskin_plist.htm | 198 +-- doc/salome/gui/GEOM/whskin_tbars.htm | 8 +- doc/salome/gui/GEOM/whskin_tw.htm | 63 + doc/salome/gui/GEOM/whst_topics.xml | 3 +- doc/salome/gui/GEOM/whstart.js | 212 ++- doc/salome/gui/GEOM/whstub.js | 11 +- doc/salome/gui/GEOM/wht_abge.jpg | Bin 23356 -> 6210 bytes doc/salome/gui/GEOM/wht_abgi.jpg | Bin 24385 -> 4967 bytes doc/salome/gui/GEOM/wht_abgw.jpg | Bin 22665 -> 5659 bytes doc/salome/gui/GEOM/wht_abte.jpg | Bin 8785 -> 9810 bytes doc/salome/gui/GEOM/wht_abti.jpg | Bin 6985 -> 3863 bytes doc/salome/gui/GEOM/wht_abtw.jpg | Bin 7382 -> 3973 bytes doc/salome/gui/GEOM/whtbar.js | 75 +- doc/salome/gui/GEOM/whtdhtml.htm | 4 +- doc/salome/gui/GEOM/whthost.js | 452 +++--- doc/salome/gui/GEOM/whtopic.js | 628 +++++---- doc/salome/gui/GEOM/whutils.js | 108 +- doc/salome/gui/GEOM/whver.js | 91 +- doc/salome/gui/GEOM/whxdata/whftdata0.xml | 21 + doc/salome/gui/GEOM/whxdata/whfts.xml | 9 + doc/salome/gui/GEOM/whxdata/whfwdata0.xml | 260 ++++ doc/salome/gui/GEOM/whxdata/whfwdata1.xml | 273 ++++ doc/salome/gui/GEOM/whxdata/whfwdata2.xml | 208 +++ doc/salome/gui/GEOM/whxdata/whgdata0.xml | 22 + doc/salome/gui/GEOM/whxdata/whglo.xml | 5 + doc/salome/gui/GEOM/whxdata/whidx.xml | 4 + doc/salome/gui/GEOM/whxdata/whtdata0.xml | 28 + doc/salome/gui/GEOM/whxdata/whtoc.xml | 4 + doc/salome/gui/GEOM/working_with_groups.htm | 80 +- idl/GEOM_Superv.idl | 213 +-- resources/GEOMCatalog.xml | 413 ++++-- src/BasicGUI/BasicGUI_MarkerDlg.cxx | 7 +- src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx | 7 +- src/GEOMAlgo/GEOMAlgo.cdl | 44 + src/GEOMAlgo/GEOMAlgo_Algo.cdl | 39 + src/GEOMAlgo/GEOMAlgo_Algo.cxx | 43 + src/GEOMAlgo/GEOMAlgo_Algo.hxx | 99 ++ src/GEOMAlgo/GEOMAlgo_Algo.ixx | 26 + src/GEOMAlgo/GEOMAlgo_Algo.jxx | 3 + src/GEOMAlgo/GEOMAlgo_Gluer.cdl | 113 ++ src/GEOMAlgo/GEOMAlgo_Gluer.cxx | 828 +++++++++++ src/GEOMAlgo/GEOMAlgo_Gluer.hxx | 141 ++ src/GEOMAlgo/GEOMAlgo_Gluer.ixx | 26 + src/GEOMAlgo/GEOMAlgo_Gluer.jxx | 18 + ...aMapNodeOfIndexedDataMapOfIntegerShape.hxx | 143 ++ ...apNodeOfIndexedDataMapOfIntegerShape_0.cxx | 100 ++ ...deOfIndexedDataMapOfPassKeyListOfShape.hxx | 147 ++ ...OfIndexedDataMapOfPassKeyListOfShape_0.cxx | 103 ++ ...dDataMapNodeOfIndexedDataMapOfShapeBox.hxx | 147 ++ ...ataMapNodeOfIndexedDataMapOfShapeBox_0.cxx | 103 ++ .../GEOMAlgo_IndexedDataMapOfIntegerShape.hxx | 140 ++ ...EOMAlgo_IndexedDataMapOfIntegerShape_0.cxx | 57 + ...lgo_IndexedDataMapOfPassKeyListOfShape.hxx | 141 ++ ...o_IndexedDataMapOfPassKeyListOfShape_0.cxx | 60 + .../GEOMAlgo_IndexedDataMapOfShapeBox.hxx | 141 ++ .../GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx | 60 + src/GEOMAlgo/GEOMAlgo_PassKey.cdl | 78 ++ src/GEOMAlgo/GEOMAlgo_PassKey.cxx | 254 ++++ src/GEOMAlgo/GEOMAlgo_PassKey.hxx | 126 ++ src/GEOMAlgo/GEOMAlgo_PassKey.ixx | 26 + src/GEOMAlgo/GEOMAlgo_PassKey.jxx | 9 + src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl | 29 + src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx | 26 + src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx | 96 ++ src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx | 26 + src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx | 6 + src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl | 47 + src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx | 66 + src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx | 111 ++ src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx | 26 + src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx | 6 + src/GEOMAlgo/GEOMAlgo_Tools.cdl | 77 ++ src/GEOMAlgo/GEOMAlgo_Tools.cxx | 397 ++++++ src/GEOMAlgo/GEOMAlgo_Tools.hxx | 113 ++ src/GEOMAlgo/GEOMAlgo_Tools.ixx | 26 + src/GEOMAlgo/GEOMAlgo_Tools.jxx | 27 + ...aMapNodeOfIndexedDataMapOfIntegerShape.hxx | 91 ++ ...deOfIndexedDataMapOfPassKeyListOfShape.hxx | 91 ++ ...dDataMapNodeOfIndexedDataMapOfShapeBox.hxx | 91 ++ src/GEOMAlgo/Makefile.in | 72 + src/GEOMGUI/GEOM_msg_en.po | 4 + src/GEOMGUI/GeometryGUI.cxx | 29 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 317 +---- src/GEOMImpl/GEOMImpl_VectorDriver.cxx | 8 +- src/GEOMImpl/Makefile.in | 81 +- src/GEOMToolsGUI/GEOMToolsGUI.cxx | 14 +- src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx | 4 +- src/GEOM_I/GEOM_Gen_i.cc | 22 +- src/GEOM_I_Superv/GEOM_List_i.hh | 85 ++ src/GEOM_I_Superv/GEOM_Superv_i.cc | 292 +++- src/GEOM_I_Superv/GEOM_Superv_i.hh | 80 +- src/GEOM_I_Superv/Makefile.in | 2 +- src/GEOM_SWIG/GEOM_TestOthers.py | 24 +- src/GEOM_SWIG/GEOM_cyl2complementary.py | 88 ++ src/GEOM_SWIG/GEOM_shellSolid.py | 678 +++++++++ src/GEOM_SWIG/GEOM_tube_geom.py | 151 ++ src/GEOM_SWIG/GEOM_tube_geom_gg2.py | 157 +++ src/GEOM_SWIG/Makefile.in | 4 + src/GEOM_SWIG/batchmode_geompy.py | 34 +- src/Makefile.in | 2 +- 316 files changed, 14136 insertions(+), 4962 deletions(-) create mode 100755 doc/salome/gui/GEOM/ehelp.xml create mode 100755 doc/salome/gui/GEOM/geom.htm create mode 100755 doc/salome/gui/GEOM/geom.log create mode 100755 doc/salome/gui/GEOM/geom_csh.htm create mode 100755 doc/salome/gui/GEOM/geom_rhc.htm create mode 100755 doc/salome/gui/GEOM/image221.jpg create mode 100755 doc/salome/gui/GEOM/image222.jpg create mode 100755 doc/salome/gui/GEOM/image223.jpg create mode 100755 doc/salome/gui/GEOM/image224.jpg create mode 100755 doc/salome/gui/GEOM/image225.jpg create mode 100755 doc/salome/gui/GEOM/image226.jpg create mode 100755 doc/salome/gui/GEOM/image227.jpg create mode 100755 doc/salome/gui/GEOM/image228.jpg create mode 100755 doc/salome/gui/GEOM/image229.jpg create mode 100755 doc/salome/gui/GEOM/image230.jpg create mode 100755 doc/salome/gui/GEOM/image231.jpg create mode 100755 doc/salome/gui/GEOM/image233.jpg create mode 100755 doc/salome/gui/GEOM/image234.jpg create mode 100755 doc/salome/gui/GEOM/image235.jpg create mode 100755 doc/salome/gui/GEOM/image236.jpg create mode 100755 doc/salome/gui/GEOM/image237.jpg create mode 100755 doc/salome/gui/GEOM/image238.jpg create mode 100755 doc/salome/gui/GEOM/image239.jpg create mode 100755 doc/salome/gui/GEOM/image240.jpg create mode 100755 doc/salome/gui/GEOM/image241.jpg create mode 100755 doc/salome/gui/GEOM/image242.jpg create mode 100755 doc/salome/gui/GEOM/image243.jpg create mode 100755 doc/salome/gui/GEOM/image244.jpg create mode 100755 doc/salome/gui/GEOM/image245.jpg create mode 100755 doc/salome/gui/GEOM/image246.jpg create mode 100755 doc/salome/gui/GEOM/image247.jpg create mode 100755 doc/salome/gui/GEOM/image248.jpg create mode 100755 doc/salome/gui/GEOM/image249.jpg create mode 100755 doc/salome/gui/GEOM/image250.jpg create mode 100755 doc/salome/gui/GEOM/image251.jpg create mode 100755 doc/salome/gui/GEOM/image252.jpg create mode 100755 doc/salome/gui/GEOM/image253.jpg create mode 100755 doc/salome/gui/GEOM/image254.jpg create mode 100755 doc/salome/gui/GEOM/image255.jpg create mode 100755 doc/salome/gui/GEOM/image256.jpg create mode 100755 doc/salome/gui/GEOM/image257.jpg create mode 100755 doc/salome/gui/GEOM/image258.jpg create mode 100755 doc/salome/gui/GEOM/image259.jpg create mode 100755 doc/salome/gui/GEOM/image260.jpg create mode 100755 doc/salome/gui/GEOM/image261.jpg create mode 100755 doc/salome/gui/GEOM/image262.jpg create mode 100755 doc/salome/gui/GEOM/image263.jpg create mode 100755 doc/salome/gui/GEOM/image264.jpg create mode 100755 doc/salome/gui/GEOM/image265.jpg create mode 100755 doc/salome/gui/GEOM/image266.jpg create mode 100755 doc/salome/gui/GEOM/image267.jpg create mode 100755 doc/salome/gui/GEOM/image268.jpg create mode 100755 doc/salome/gui/GEOM/image269.jpg create mode 100755 doc/salome/gui/GEOM/image270.jpg create mode 100755 doc/salome/gui/GEOM/image271.jpg create mode 100755 doc/salome/gui/GEOM/image272.jpg create mode 100755 doc/salome/gui/GEOM/image273.jpg create mode 100755 doc/salome/gui/GEOM/image274.jpg create mode 100755 doc/salome/gui/GEOM/image275.jpg create mode 100755 doc/salome/gui/GEOM/image276.jpg create mode 100755 doc/salome/gui/GEOM/image277.jpg create mode 100755 doc/salome/gui/GEOM/image278.jpg create mode 100755 doc/salome/gui/GEOM/image279.jpg create mode 100755 doc/salome/gui/GEOM/image280.jpg create mode 100755 doc/salome/gui/GEOM/image281.jpg create mode 100755 doc/salome/gui/GEOM/image282.jpg create mode 100755 doc/salome/gui/GEOM/image283.jpg create mode 100755 doc/salome/gui/GEOM/image284.jpg create mode 100755 doc/salome/gui/GEOM/image285.jpg create mode 100755 doc/salome/gui/GEOM/image286.jpg create mode 100755 doc/salome/gui/GEOM/image287.jpg create mode 100755 doc/salome/gui/GEOM/image288.jpg create mode 100755 doc/salome/gui/GEOM/image289.jpg create mode 100755 doc/salome/gui/GEOM/image290.jpg create mode 100755 doc/salome/gui/GEOM/image291.jpg create mode 100755 doc/salome/gui/GEOM/image292.jpg create mode 100755 doc/salome/gui/GEOM/image293.jpg create mode 100755 doc/salome/gui/GEOM/image294.jpg create mode 100755 doc/salome/gui/GEOM/image295.jpg create mode 100755 doc/salome/gui/GEOM/image296.jpg create mode 100755 doc/salome/gui/GEOM/image297.jpg create mode 100755 doc/salome/gui/GEOM/image298.jpg create mode 100755 doc/salome/gui/GEOM/image299.jpg create mode 100755 doc/salome/gui/GEOM/image300.jpg create mode 100755 doc/salome/gui/GEOM/image64.gif create mode 100755 doc/salome/gui/GEOM/whcsh_home.htm create mode 100755 doc/salome/gui/GEOM/whcshdata.htm create mode 100755 doc/salome/gui/GEOM/whdata/whfwdata1.htm create mode 100755 doc/salome/gui/GEOM/whdata/whfwdata2.htm create mode 100755 doc/salome/gui/GEOM/whgdata/whlstfl23.htm create mode 100755 doc/salome/gui/GEOM/whskin_homepage.htm create mode 100755 doc/salome/gui/GEOM/whskin_pickup.htm create mode 100755 doc/salome/gui/GEOM/whskin_tw.htm create mode 100755 doc/salome/gui/GEOM/whxdata/whftdata0.xml create mode 100755 doc/salome/gui/GEOM/whxdata/whfts.xml create mode 100755 doc/salome/gui/GEOM/whxdata/whfwdata0.xml create mode 100755 doc/salome/gui/GEOM/whxdata/whfwdata1.xml create mode 100755 doc/salome/gui/GEOM/whxdata/whfwdata2.xml create mode 100755 doc/salome/gui/GEOM/whxdata/whgdata0.xml create mode 100755 doc/salome/gui/GEOM/whxdata/whglo.xml create mode 100755 doc/salome/gui/GEOM/whxdata/whidx.xml create mode 100755 doc/salome/gui/GEOM/whxdata/whtdata0.xml create mode 100755 doc/salome/gui/GEOM/whxdata/whtoc.xml create mode 100755 src/GEOMAlgo/GEOMAlgo.cdl create mode 100755 src/GEOMAlgo/GEOMAlgo_Algo.cdl create mode 100755 src/GEOMAlgo/GEOMAlgo_Algo.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_Algo.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_Algo.ixx create mode 100644 src/GEOMAlgo/GEOMAlgo_Algo.jxx create mode 100755 src/GEOMAlgo/GEOMAlgo_Gluer.cdl create mode 100755 src/GEOMAlgo/GEOMAlgo_Gluer.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_Gluer.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_Gluer.ixx create mode 100644 src/GEOMAlgo/GEOMAlgo_Gluer.jxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx create mode 100755 src/GEOMAlgo/GEOMAlgo_PassKey.cdl create mode 100755 src/GEOMAlgo/GEOMAlgo_PassKey.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_PassKey.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_PassKey.ixx create mode 100644 src/GEOMAlgo/GEOMAlgo_PassKey.jxx create mode 100755 src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl create mode 100755 src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx create mode 100644 src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx create mode 100644 src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl create mode 100644 src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx create mode 100644 src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx create mode 100644 src/GEOMAlgo/GEOMAlgo_Tools.cdl create mode 100644 src/GEOMAlgo/GEOMAlgo_Tools.cxx create mode 100644 src/GEOMAlgo/GEOMAlgo_Tools.hxx create mode 100644 src/GEOMAlgo/GEOMAlgo_Tools.ixx create mode 100644 src/GEOMAlgo/GEOMAlgo_Tools.jxx create mode 100644 src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx create mode 100644 src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx create mode 100644 src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx create mode 100644 src/GEOMAlgo/Makefile.in create mode 100644 src/GEOM_I_Superv/GEOM_List_i.hh create mode 100755 src/GEOM_SWIG/GEOM_cyl2complementary.py create mode 100755 src/GEOM_SWIG/GEOM_shellSolid.py create mode 100755 src/GEOM_SWIG/GEOM_tube_geom.py create mode 100755 src/GEOM_SWIG/GEOM_tube_geom_gg2.py diff --git a/doc/salome/gui/GEOM/blocks.htm b/doc/salome/gui/GEOM/blocks.htm index ce53dbc61..f3b20495e 100755 --- a/doc/salome/gui/GEOM/blocks.htm +++ b/doc/salome/gui/GEOM/blocks.htm @@ -2,31 +2,11 @@ - - - - - Building of blocks - - - - - - - - - - - - - - - - - - - - + - - - - - - -

Building of blocks

@@ -140,5 +113,4 @@ if (window.writeIntopicBar) //--> - diff --git a/doc/salome/gui/GEOM/changing_displaying_parameters.htm b/doc/salome/gui/GEOM/changing_displaying_parameters.htm index db074bc3b..fe76d2a52 100755 --- a/doc/salome/gui/GEOM/changing_displaying_parameters.htm +++ b/doc/salome/gui/GEOM/changing_displaying_parameters.htm @@ -2,31 +2,11 @@ - - - - - Changing displaying parameters - - - - - - - - - - - - - - - - - - - - + - - - - - - -

Changing displaying parameters

@@ -147,8 +120,7 @@ else

 

-

Wireframe/Shading +

Wireframe/Shading

 

@@ -271,5 +243,4 @@ if (window.writeIntopicBar) //--> - diff --git a/doc/salome/gui/GEOM/cshdat_robohelp.htm b/doc/salome/gui/GEOM/cshdat_robohelp.htm index 9f2de5bdf..afb68b6ee 100755 --- a/doc/salome/gui/GEOM/cshdat_robohelp.htm +++ b/doc/salome/gui/GEOM/cshdat_robohelp.htm @@ -1,9 +1,9 @@ GEOM reference manual - + - + - - + - - - - - - -

Introduction to GEOM

@@ -124,7 +97,6 @@ else

 

- @@ -163,5 +135,4 @@ if (window.writeIntopicBar) //--> - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm index dc3c7060b..d6dca9850 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm @@ -2,159 +2,117 @@ - - - - - Titre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - -

Creating basic geometrical objects
  • 1st - Constructor: 3 coordinates.

  • + Constructor:
    Name + 3 coordinates.

  • 2nd - Constructor: 1 reference point + 3 coordinates defining the - position of this point regarding the reference one

  • + Constructor: Name + 1 reference point + 3 coordinates defining + the position of this point regarding the reference one

    -
  • 2nd - Constructor: 1 edge  + +

  • 2nd Constructor: + Name + 1 edge  + 1 Parameter defining the position of the point on the given edge.

  • @@ -336,18 +288,17 @@ else

     

    - -

    +
    - - -
    +

    +

    +

    @@ -391,8 +342,7 @@ else

     

    -

    Arguments: - 2 vertices.

    +

    Arguments: Name + 2 vertices.

     

    @@ -400,7 +350,7 @@ else

     

    -

    +

     

    @@ -441,12 +391,11 @@ else
      -
    • 1st - Constructor: 1 vertex (for the center) + 1 edge (for the direction) - + Radius.

    • +
    • 1st Constructor: + Name + 1 vertex (for the center) + 1 edge (for the direction) + Radius.

    • 2nd - Constructor: 3 points which will form the circle.

    • + Constructor: Name + 3 points which will form the circle.

     

    @@ -459,16 +408,15 @@ else

     

    - - +
    - - + +
    -

    -

    +

    +

     

    @@ -483,7 +431,7 @@ else

     

    -

    +

     

    @@ -510,9 +458,8 @@ else

     

    -

    Arguments: - 1 vertex (for the center) + 1 edge (for the direction) + 1 X Radius + - 1 Y Radius.

    +

    Arguments: Name + 1 vertex (for the + center) + 1 edge (for the direction) + 1 X Radius + 1 Y Radius.

     

    @@ -520,15 +467,15 @@ else

     

    -

    +

    -

     

    +

     

    Example:

     

    -

    +

     

    @@ -556,8 +503,7 @@ else

     

    -

    Arguments: - 3 vertices.

    +

    Arguments: Name + 3 vertices.

     

    @@ -565,7 +511,7 @@ else

     

    -

    +

     

    @@ -573,13 +519,13 @@ else

     

    -

    +

     

     

    -

    Curve

    +

    Curve

     

    @@ -610,8 +556,8 @@ else

     

    -

    Arguments: - at least 2.

    +

    Arguments: Name + at least 2 points + which will serve as nodes on the curve.

     

    @@ -619,19 +565,19 @@ else

     

    -

    +

     

    -

    Example:

    +

    Example:

     

    -

    Polyline +

    Polyline                                          Bezier                                      B-Spline

    -

              

    +

              

     

    @@ -664,20 +610,20 @@ else

     

    Dialog Box:

    -

     

    +

     

    -

       

    +

          

     

    @@ -716,16 +662,16 @@ else

     

    @@ -734,19 +680,18 @@ else

     

    - - +
    - - - + + +
    -

    -

    -

    +

    +

    +

     

    @@ -757,11 +702,11 @@ else

     

    -

    Example:

    +

    Example:

     

    -

    +

     

    @@ -783,52 +728,53 @@ else

     

     

    -

    Dialog Box:

    +

    Dialog Box:

     

    - - ---+
    +++- - - - + + + +
    -

    -

    -

    +

    +

    +

     

    -

     

    +

     

     

    -

     

    +

     

    -

     

    +

     

    -

    Local coordinate system

    -

     

    +

     

    Description:  The user @@ -862,19 +808,19 @@ else

     

    -

    Arguments:

    +

    Arguments: +

     

    @@ -883,36 +829,35 @@ else

     

    -

    Dialog Box:

    +

    Dialog Box:

     

    - - ---- - - - - +
    -

    -

    -

     

    ++++ + + + +
    +

    +

    +

     

    -

     

    +

     

    -

     

    +

      

    -

     

    +

     

    -

    Example:

    +

    Example:

    -

     

    +

     

    -

    +

    - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm index 35a35ff0c..ca0289e54 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm @@ -2,41 +2,11 @@ - - - - - Titre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - -

    Using boolean operations

    @@ -212,7 +176,7 @@ else

     

    Arguments: - 2 shapes.

    + Name + 2 shapes.

     

    @@ -220,7 +184,7 @@ else

     

    -

    +

     

    @@ -240,7 +204,7 @@ else

     

    Description: - The common part of 2 shapes is cut and transformed into an independent + The common part of two shapes is cut and transformed into an independent geometrical object.

     

    @@ -251,7 +215,7 @@ else

     

    Arguments: - 2 shapes.

    + Name + 2 shapes.

     

    @@ -259,7 +223,7 @@ else

     

    -

    +

     

    @@ -280,7 +244,7 @@ else

     

    Description: - Cuts 1 shape with another one.

    + Cuts a shape with another one.

     

    @@ -290,7 +254,7 @@ else

     

    Arguments: - 2 shapes.

    + Name + 2 shapes.

     

    @@ -298,7 +262,7 @@ else

     

    -

    +

     

    @@ -329,7 +293,7 @@ else

     

    Arguments: - 2 shapes.

    + Name + 2 shapes.

     

    @@ -337,7 +301,7 @@ else

     

    -

    +

     

    @@ -351,7 +315,7 @@ else

     

    -

      

    +

      

    - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_buildgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_buildgui_functions.htm index bf2ce3777..f541158b5 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_buildgui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_buildgui_functions.htm @@ -2,41 +2,11 @@ - - - - - Titre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - -

    Building @@ -219,7 +183,7 @@ else

     

    -

    +

     

    @@ -257,7 +221,7 @@ else

     

    Arguments: - 2 vertices.

    + Name + 2 vertices.

     

    @@ -265,7 +229,7 @@ else

     

    -

    +

     

    @@ -300,7 +264,7 @@ else

     

    Arguments: - List of shapes (VERTEX, EDGE or WIRE).

    + Name + List of connected wires or edges..

     

    @@ -308,7 +272,7 @@ else

     

    -

    +

     

    @@ -343,7 +307,7 @@ else

     

    Arguments: - 1 wire.

    + Name + 1 wire.

     

    @@ -351,7 +315,7 @@ else

     

    -

    +

     

    @@ -386,7 +350,7 @@ else

     

    Arguments: - List of faces having connected edges.

    + Name + List of faces having connected edges.

     

    @@ -394,7 +358,7 @@ else

     

    -

    +

     

    @@ -428,7 +392,7 @@ else

     

    Arguments: - A closed shell or a list of shells.

    + Name + A closed shell or a list of shells.

     

    @@ -436,7 +400,7 @@ else

     

    -

    +

     

    @@ -464,7 +428,7 @@ else

     

    Arguments: - List of shapes.

    + Name + List of shapes.

     

    @@ -472,7 +436,7 @@ else

     

    -

    +

     

    @@ -480,7 +444,7 @@ else

     

    -

    +

     

    @@ -495,5 +459,4 @@ if (window.writeIntopicBar) //--> - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions.htm index af0c4cf8b..54d59fb05 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions.htm @@ -2,41 +2,11 @@ - - - - - Titre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - -

    Displaying\hiding objects

    Visualization is available in both, OCC and VTK viewers. These viewers work independently, i.e. visibility of objects and their - graphic attributes may differ in OCC and VTK viewer. It - is reasonable to use the OCC viewer for GEOM module.

    + graphic attributes may differ in OCC and VTK viewer. It is reasonable to use the OCC viewer for + GEOM module.

     

    @@ -190,7 +154,7 @@ else

     

    -

    TUI +

    TUI Command: sg.EraseAll()

     

    @@ -209,7 +173,7 @@ else

     

    -

    TUI +

    TUI Command:

     

    @@ -259,5 +223,4 @@ if (window.writeIntopicBar) //--> - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions.htm index 260fc51a7..c944e7b4a 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions.htm @@ -2,79 +2,40 @@ - - - - - Titre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - -

    Generating complex objects

    @@ -184,8 +139,8 @@ else

     

    Arguments: - 1 shape (vertex, edge, wire, face or shell) serving as base object + 1 - vector (for direction) + 1 value (dimension).

    + Name + 1 shape (vertex, edge, wire, face or shell) serving as base object + + 1 vector (for direction) + 1 value (dimension).

     

    @@ -193,7 +148,7 @@ else

     

    -

    +

     

    @@ -229,9 +184,9 @@ else

     

    -

    Arguments: - 1 shape (vertex, edge, wire, face or shell) serving as base object + 1 - vector (for direction) + 1 value (angle).

    +

    Arguments: Name + 1 shape (vertex, edge, + wire, face or shell) serving as base object + 1 vector (for direction) + + 1 value (angle).

     

    @@ -239,7 +194,7 @@ else

     

    -

    +

     

    @@ -247,7 +202,7 @@ else

     

    -

     

    +

     

     

    @@ -274,9 +229,9 @@ else

     

    -

    Arguments: - 1 List of edges + 5 Parameters (Min. degree, Max. degree, Number of iterations, - 2D tolerance, 3D tolerance).

    +

    Arguments: Name + 1 List of edges + + 5 Parameters (Min. degree, Max. degree, Number of iterations, 2D tolerance, + 3D tolerance).

     

    @@ -284,7 +239,7 @@ else

     

    -

    +

     

    @@ -294,13 +249,13 @@ else

     

    -

     

    +

     

    -

     

    +

     

    Pipe

    -

    @@ -322,9 +277,9 @@ else

     

    -

    Arguments: - 1 shape (vertex, edge, wire, face or shell) serving as base object + 1 - shape (edge, face or shell) for definition of the path.

    +

    Arguments: Name + 1 shape (vertex, edge, + wire, face or shell) serving as base object + 1 shape (edge, face or shell) + for definition of the path.

     

    @@ -332,7 +287,7 @@ else

     

    -

    +

     

    @@ -340,7 +295,7 @@ else

     

    -

     

    +

     

     

    @@ -351,5 +306,4 @@ if (window.writeIntopicBar) //--> - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm index c70dca7fa..2558b47a7 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm @@ -2,42 +2,11 @@ - - - - - Titre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - -

    Importing\exporting geometrical objects

    @@ -190,5 +152,4 @@ if (window.writeIntopicBar) //--> - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm index c85165ba1..56f72dc27 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm @@ -2,87 +2,46 @@ - - - - - Titre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - -

    Using measurement tools

    @@ -160,8 +113,7 @@ else
  • Center of mass

  • -
  • Axis - of inertia

  • +
  • Inertia

  • Bounding box

  • @@ -220,7 +172,7 @@ else

     

    -

    +

     

    @@ -259,7 +211,7 @@ else

     

    -

    +

     

    @@ -267,7 +219,7 @@ else

    - Center of gravity

    + Center of mass

     

    @@ -296,7 +248,7 @@ else

     

    -

    +

     

    @@ -304,8 +256,8 @@ else

    Axis of - inertia

    + size=4> Inertia
    +

     

    @@ -315,15 +267,16 @@ else

     

    Result: Display - the inertia axis values in the form of Python Tuple (I11, I12, I13,

    + the matrix and moments of inretia in the form of Python Tuple (I11, I12, + I13,

    -

     I21, +

     I21, I22, I23,

    -

     I31, +

     I31, I32, I33,

    -

     Ix, +

     Ix, Iy, Iz).

     

    @@ -342,9 +295,9 @@ else

    Dialog Box:

    -

     

    +

     

    -

    +

     

    @@ -368,7 +321,7 @@ else

     

    -

    TUI command: geompy.BoundingBox(Shape)TUI command: geompy.BoundingBox(Shape), where Shape is a shape for which a bounding box is computed.

    @@ -383,7 +336,7 @@ else

     

    -

    +

     

    @@ -405,11 +358,11 @@ else

     

    -

    TUI command: geompy.MinDistance(Shape1, +

    TUI command: geompy.MinDistance(Shape1, Shape2), where Shape1 and Shape2 are shapes between which the minimal distance computed.

    -

     

    +

     

    Arguments: 2 shapes.

    @@ -420,7 +373,7 @@ else

     

    -

    +

     

    @@ -443,7 +396,7 @@ else

     

    -

    TUI command: geompy.Tolerance(Shape)TUI command: geompy.Tolerance(Shape), where Shape is a shape for which minimal and maximal tolerances are returned.

    @@ -458,7 +411,7 @@ else

     

    -

    +

     

    @@ -495,11 +448,11 @@ else

     

    -

    +

    -

     

    +

     

    -

     

    +

     

     

    -

    +

    -

     

    +

     

    - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm index 2e8626959..dc01866bc 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm @@ -2,106 +2,73 @@ - - - - - Titre - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - -

    Basic operations

    @@ -244,8 +205,20 @@ else

     

    -

    Arguments: - Up to 4 shapes + reconstruction limit.

    +

    Arguments: Up to 4 shapes + reconstruction + limit.

    + +
      + +
    • 1st Constructor: + Name + 2 shapes (first shape will be intersected by the second shape) + + reconstruction limit.

    • + +
    • 2nd Constructor: + Name + 1 shape which will be intersected + 1 cutting face.

    • +
    + +

     

     

    @@ -253,7 +226,11 @@ else

     

    -

    +

    + +

     

    + +

     

    @@ -261,7 +238,7 @@ else

     

    -

     

    +

     

     

    @@ -291,7 +268,7 @@ else

     

    GUI Arguments: - 1 shape  + + Name + 1 shape  + 3 values (Weight, Water Density & Meshing Deflection).

     

    @@ -300,7 +277,7 @@ else

     

    -

    +

     

    @@ -308,7 +285,7 @@ else

     

    -

       

    +

       

     

    @@ -341,14 +318,14 @@ else
      -
    • 1st - Constructor: 1 shape + 1 value (fillet radius).

    • +
    • 1st Constructor: + Name + 1 shape + 1 value (fillet radius).

    • -
    • 2nd - Constructor: 1 SHAPE + 1 Selection of edges + 1 values (Fillet radius).

    • +
    • 2nd Constructor: + Name + 1 shape + 1 Selection of edges + 1 value (Fillet radius).

    • -
    • 3rd - Constructor: 1 SHAPE + 1 Selection of faces + 1 values (Fillet radius).

    • +
    • 3rd Constructor: + Name + 1 shape + 1 Selection of faces + 1 value (Fillet radius).

     

    @@ -357,7 +334,7 @@ else

     

    -

       

    +

       

     

    @@ -365,7 +342,7 @@ else

     

    -

     

    +

     

     

    @@ -412,14 +389,14 @@ else
      -
    • 1st - Constructor : 1 SHAPE + 2 values (Chamfer dimensions).

    • +
    • 1st Constructor : + Name + 1 SHAPE + 1 value (Chamfer dimension).

    • -
    • 2nd - Constructor : 1 SHAPE + 1 Selection of EDGE + 2 values (Chamfer dimensions).

    • +
    • 2nd Constructor : + Name + 1 SHAPE + 2 faces + 2 values (Chamfer dimensions).

    • -
    • 3rd - Constructor : 1 SHAPE + 1 Selection of FACE + 2 values (Chamfer dimensions).

    • +
    • 3rd Constructor : + Name + 1 SHAPE + 1 Selection of faces + 2 values (Chamfer dimensions).

     

    @@ -428,7 +405,7 @@ else

     

    -

       

    +

       

     

    @@ -436,7 +413,7 @@ else

     

    -

     

    +

     

     

    @@ -448,7 +425,7 @@ else

     

    -

    Block +

    Block multi-transformation

     

    @@ -493,21 +470,21 @@ else