From 1968ea1dc4875785b89f7b8c8006554b0d25d2c0 Mon Sep 17 00:00:00 2001 From: admin Date: Wed, 17 Nov 2004 15:16:34 +0000 Subject: [PATCH] Merge with PAL/SALOME 2.1.0d --- Makefile.in | 3 +- doc/salome/gui/GEOM/GEOM.log | 346 +- doc/salome/gui/GEOM/blocks.htm | 2 +- .../GEOM/changing_displaying_parameters.htm | 2 +- .../gui/GEOM/files/introduction_to_geom.htm | 2 +- .../files/salome2_sp3_basicgui_functions.htm | 381 +- .../salome2_sp3_booleangui_functions.htm | 2 +- .../files/salome2_sp3_buildgui_functions.htm | 2 +- .../salome2_sp3_displaygui_functions.htm | 2 +- .../salome2_sp3_generationgui_functions.htm | 2 +- .../salome2_sp3_geomtoolsgui_functions.htm | 6 +- .../salome2_sp3_measuregui_functions.htm | 2 +- .../salome2_sp3_operationgui_functions.htm | 2 +- .../salome2_sp3_primitivegui_functions.htm | 2 +- .../files/salome2_sp3_repairgui_functions.htm | 110 +- ...alome2_sp3_transformationgui_functions.htm | 126 +- doc/salome/gui/GEOM/image196.jpg | Bin 0 -> 12763 bytes doc/salome/gui/GEOM/image197.jpg | Bin 0 -> 9273 bytes doc/salome/gui/GEOM/image199.jpg | Bin 0 -> 13440 bytes doc/salome/gui/GEOM/image200.jpg | Bin 0 -> 13194 bytes doc/salome/gui/GEOM/image201.jpg | Bin 0 -> 5193 bytes doc/salome/gui/GEOM/image202.jpg | Bin 0 -> 6377 bytes doc/salome/gui/GEOM/image203.jpg | Bin 0 -> 14865 bytes doc/salome/gui/GEOM/image204.jpg | Bin 0 -> 5191 bytes doc/salome/gui/GEOM/image205.jpg | Bin 0 -> 13829 bytes doc/salome/gui/GEOM/image206.jpg | Bin 0 -> 4983 bytes doc/salome/gui/GEOM/image207.jpg | Bin 0 -> 13990 bytes doc/salome/gui/GEOM/image208.jpg | Bin 0 -> 10477 bytes doc/salome/gui/GEOM/image209.jpg | Bin 0 -> 11139 bytes doc/salome/gui/GEOM/image210.jpg | Bin 0 -> 12886 bytes doc/salome/gui/GEOM/image211.jpg | Bin 0 -> 12992 bytes doc/salome/gui/GEOM/image212.jpg | Bin 0 -> 11806 bytes doc/salome/gui/GEOM/image213.jpg | Bin 0 -> 12481 bytes doc/salome/gui/GEOM/image214.jpg | Bin 0 -> 12759 bytes doc/salome/gui/GEOM/image215.jpg | Bin 0 -> 10568 bytes doc/salome/gui/GEOM/image216.jpg | Bin 0 -> 12504 bytes doc/salome/gui/GEOM/image217.jpg | Bin 0 -> 11989 bytes doc/salome/gui/GEOM/image218.jpg | Bin 0 -> 13752 bytes doc/salome/gui/GEOM/image219.jpg | Bin 0 -> 12098 bytes doc/salome/gui/GEOM/image220.jpg | Bin 0 -> 18424 bytes doc/salome/gui/GEOM/image59.gif | Bin 0 -> 963 bytes doc/salome/gui/GEOM/image61.gif | Bin 0 -> 975 bytes doc/salome/gui/GEOM/newentity_blocks.htm | 2 +- doc/salome/gui/GEOM/sketcher.htm | 81 +- doc/salome/gui/GEOM/whdata/whfwdata0.htm | 360 +- doc/salome/gui/GEOM/whdata/whfwdata0.xml | 360 +- doc/salome/gui/GEOM/whgdata/whlstf0.htm | 4 +- doc/salome/gui/GEOM/whgdata/whlstf1.htm | 4 +- doc/salome/gui/GEOM/whgdata/whlstf2.htm | 6 +- doc/salome/gui/GEOM/whgdata/whlstf3.htm | 8 +- doc/salome/gui/GEOM/whgdata/whlstf4.htm | 6 +- doc/salome/gui/GEOM/whgdata/whlstf5.htm | 6 +- doc/salome/gui/GEOM/whgdata/whlstfl18.htm | 2 +- doc/salome/gui/GEOM/whgdata/whlstfl4.htm | 2 +- doc/salome/gui/GEOM/whskin_info.htm | 4 +- doc/salome/gui/GEOM/working_with_groups.htm | 2 +- idl/GEOM_Gen.idl | 376 +- idl/GEOM_Superv.idl | 375 ++ idl/Makefile.in | 3 +- resources/GEOMCatalog.xml | 3625 ++++++++++++++++- resources/GEOM_en.xml | 1 + resources/glue.png | Bin 0 -> 408 bytes src/BasicGUI/BasicGUI.cxx | 2 + src/BasicGUI/BasicGUI_CircleDlg.cxx | 1 + src/BasicGUI/BasicGUI_MarkerDlg.cxx | 21 +- src/BlocksGUI/BlocksGUI_BlockDlg.cxx | 4 +- src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx | 4 +- src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx | 6 +- src/BlocksGUI/BlocksGUI_TrsfDlg.cxx | 6 +- src/BooleanGUI/BooleanGUI_Dialog.cxx | 7 +- src/BuildGUI/BuildGUI_CompoundDlg.cxx | 19 +- src/BuildGUI/BuildGUI_ShellDlg.cxx | 18 +- src/EntityGUI/EntityGUI.cxx | 1 + src/EntityGUI/EntityGUI_SubShapeDlg.cxx | 4 +- src/GEOM/GEOM_Engine.cxx | 94 +- src/GEOM/GEOM_Function.cxx | 61 +- src/GEOM/GEOM_SubShapeDriver.cxx | 61 +- src/GEOMBase/GEOMBase.cxx | 80 +- src/GEOMBase/GEOMBase.h | 10 +- src/GEOMBase/GEOMBase_Helper.cxx | 2 +- src/GEOMBase/GEOMBase_Helper.h | 4 +- src/GEOMClient/GEOM_Client.cxx | 14 + src/GEOMClient/GEOM_Client.hxx | 1 + .../GEOM_LogicalFilter.cxx | 15 +- .../GEOM_LogicalFilter.hxx | 3 +- .../GEOM_ShapeTypeFilter.cxx | 39 +- .../GEOM_ShapeTypeFilter.hxx | 20 +- src/GEOMGUI/GEOM_Displayer.cxx | 48 +- src/GEOMGUI/GEOM_Displayer.h | 7 +- src/GEOMGUI/GEOM_icons.po | 3 + src/GEOMGUI/GEOM_msg_en.po | 32 + src/GEOMGUI/GeometryGUI.cxx | 19 +- src/GEOMGUI/GeometryGUI.h | 3 +- src/GEOMGUI/GeometryGUI_Swig.cxx | 1 + src/GEOMImpl/GEOMImpl_Block6Explorer.cxx | 214 +- src/GEOMImpl/GEOMImpl_Block6Explorer.hxx | 16 + src/GEOMImpl/GEOMImpl_BlockDriver.cxx | 90 +- src/GEOMImpl/GEOMImpl_ChamferDriver.cxx | 19 +- src/GEOMImpl/GEOMImpl_FilletDriver.cxx | 24 +- src/GEOMImpl/GEOMImpl_FillingDriver.cxx | 119 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 56 +- src/GEOMImpl/GEOMImpl_IBasicOperations.cxx | 59 + src/GEOMImpl/GEOMImpl_IBasicOperations.hxx | 15 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 1023 ++++- src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx | 78 +- src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 112 +- src/GEOMImpl/GEOMImpl_ILocalOperations.hxx | 11 +- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 55 +- src/GEOMImpl/GEOMImpl_IShapesOperations.hxx | 3 + src/GEOMImpl/GEOMImpl_LineDriver.cxx | 30 + src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 40 +- src/GEOMImpl/GEOMImpl_PointDriver.cxx | 39 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx | 40 +- src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 15 +- src/GEOMImpl/GEOMImpl_TorusDriver.cxx | 41 +- src/GEOMImpl/GEOMImpl_Types.hxx | 3 +- src/GEOMToolsGUI/GEOMToolsGUI.cxx | 4 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 5 +- .../GEOMToolsGUI_TransparencyDlg.cxx | 1 + src/GEOM_I/GEOM_IBasicOperations_i.cc | 33 + src/GEOM_I/GEOM_IBasicOperations_i.hh | 3 + src/GEOM_I/GEOM_IBlocksOperations_i.cc | 328 +- src/GEOM_I/GEOM_IBlocksOperations_i.hh | 56 +- src/GEOM_I/GEOM_ILocalOperations_i.cc | 81 +- src/GEOM_I/GEOM_IShapesOperations_i.cc | 59 +- src/GEOM_I/GEOM_IShapesOperations_i.hh | 5 +- src/GEOM_I/GEOM_Object_i.cc | 43 +- src/GEOM_I/GEOM_Object_i.hh | 4 +- src/GEOM_I/Makefile.in | 17 +- src/GEOM_I_Superv/GEOM_Superv_i.cc | 1747 ++++++++ src/GEOM_I_Superv/GEOM_Superv_i.hh | 462 +++ src/GEOM_I_Superv/Makefile.in | 64 + src/GEOM_SWIG/GEOM_Partition1.py | 8 +- src/GEOM_SWIG/GEOM_Spanner.py | 34 +- src/GEOM_SWIG/GEOM_TestAll.py | 90 +- src/GEOM_SWIG/GEOM_TestHealing.py | 331 ++ src/GEOM_SWIG/GEOM_TestMeasures.py | 15 +- src/GEOM_SWIG/GEOM_TestOthers.py | 209 + src/GEOM_SWIG/GEOM_all.py | 734 ---- src/GEOM_SWIG/GEOM_moteur.py | 36 +- src/GEOM_SWIG/GEOM_usinggeom.py | 4 + src/GEOM_SWIG/Makefile.in | 41 +- src/GEOM_SWIG/batchmode_geompy.py | 233 +- src/GEOM_SWIG/geompy.py | 1475 +++++-- .../GenerationGUI_FillingDlg.cxx | 2 +- src/GenerationGUI/GenerationGUI_PipeDlg.cxx | 3 + src/GenerationGUI/GenerationGUI_PrismDlg.cxx | 5 +- src/GenerationGUI/GenerationGUI_RevolDlg.cxx | 5 +- src/GroupGUI/GroupGUI_GroupDlg.cxx | 4 +- src/Makefile.in | 2 +- src/MeasureGUI/MeasureGUI_Skeleton.cxx | 2 +- .../OperationGUI_ArchimedeDlg.cxx | 8 +- .../OperationGUI_PartitionDlg.cxx | 76 +- src/RepairGUI/Makefile.in | 6 +- src/RepairGUI/RepairGUI.cxx | 51 +- src/RepairGUI/RepairGUI_CloseContourDlg.cxx | 37 +- src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx | 8 +- src/RepairGUI/RepairGUI_FreeBoundDlg.cxx | 2 +- src/RepairGUI/RepairGUI_GlueDlg.cxx | 297 ++ src/RepairGUI/RepairGUI_GlueDlg.h | 79 + src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx | 12 +- src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx | 10 +- src/RepairGUI/RepairGUI_SewingDlg.cxx | 34 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 145 +- src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx | 86 +- .../TransformationGUI_MultiRotationDlg.cxx | 8 +- .../TransformationGUI_MultiTranslationDlg.cxx | 8 +- .../TransformationGUI_OffsetDlg.cxx | 5 +- .../TransformationGUI_PositionDlg.cxx | 10 +- 169 files changed, 12887 insertions(+), 3071 deletions(-) create mode 100755 doc/salome/gui/GEOM/image196.jpg create mode 100755 doc/salome/gui/GEOM/image197.jpg create mode 100755 doc/salome/gui/GEOM/image199.jpg create mode 100755 doc/salome/gui/GEOM/image200.jpg create mode 100755 doc/salome/gui/GEOM/image201.jpg create mode 100755 doc/salome/gui/GEOM/image202.jpg create mode 100755 doc/salome/gui/GEOM/image203.jpg create mode 100755 doc/salome/gui/GEOM/image204.jpg create mode 100755 doc/salome/gui/GEOM/image205.jpg create mode 100755 doc/salome/gui/GEOM/image206.jpg create mode 100755 doc/salome/gui/GEOM/image207.jpg create mode 100755 doc/salome/gui/GEOM/image208.jpg create mode 100755 doc/salome/gui/GEOM/image209.jpg create mode 100755 doc/salome/gui/GEOM/image210.jpg create mode 100755 doc/salome/gui/GEOM/image211.jpg create mode 100755 doc/salome/gui/GEOM/image212.jpg create mode 100755 doc/salome/gui/GEOM/image213.jpg create mode 100755 doc/salome/gui/GEOM/image214.jpg create mode 100755 doc/salome/gui/GEOM/image215.jpg create mode 100755 doc/salome/gui/GEOM/image216.jpg create mode 100755 doc/salome/gui/GEOM/image217.jpg create mode 100755 doc/salome/gui/GEOM/image218.jpg create mode 100755 doc/salome/gui/GEOM/image219.jpg create mode 100755 doc/salome/gui/GEOM/image220.jpg create mode 100755 doc/salome/gui/GEOM/image59.gif create mode 100755 doc/salome/gui/GEOM/image61.gif create mode 100644 idl/GEOM_Superv.idl create mode 100644 resources/glue.png create mode 100644 src/GEOM_I_Superv/GEOM_Superv_i.cc create mode 100644 src/GEOM_I_Superv/GEOM_Superv_i.hh create mode 100644 src/GEOM_I_Superv/Makefile.in create mode 100644 src/GEOM_SWIG/GEOM_TestHealing.py create mode 100644 src/GEOM_SWIG/GEOM_TestOthers.py delete mode 100644 src/GEOM_SWIG/GEOM_all.py create mode 100644 src/RepairGUI/RepairGUI_GlueDlg.cxx create mode 100644 src/RepairGUI/RepairGUI_GlueDlg.h diff --git a/Makefile.in b/Makefile.in index 02831b24e..933016af0 100644 --- a/Makefile.in +++ b/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 diff --git a/doc/salome/gui/GEOM/GEOM.log b/doc/salome/gui/GEOM/GEOM.log index 6fcae47ea..e17a2ed87 100755 --- a/doc/salome/gui/GEOM/GEOM.log +++ b/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_help.hhc -geom_help.hhk +geom_hha.hhk +geom.hhc +geom.hhk blocks.htm changing_displaying_parameters.htm files\introduction_to_geom.htm @@ -144,254 +144,266 @@ files\salome2_sp3_transformationgui_functions.htm newentity_blocks.htm sketcher.htm working_with_groups.htm -geom_help.glo +geom.glo default.css +image61.gif +image191.jpg +image180.jpg +image109.jpg +image97.jpg +image86.jpg +image75.jpg +image53.jpg +image20.jpg +files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image131.gif +files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image31.gif +image192.jpg +image181.jpg +image51.gif +image170.jpg +image98.jpg +image87.jpg +image76.jpg +image65.jpg +image54.jpg +image21.jpg +image10.jpg +files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image132.gif +files\salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image121.gif +files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image32.gif +image193.jpg +image182.jpg +image52.gif +image171.jpg +image160.jpg +image41.gif +image99.jpg +image88.jpg +image66.jpg +image55.jpg +image22.jpg +image11.jpg +files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image133.gif +files\salome2_sp3_repairgui_functions_salome2_sp3_repairgui_functions_image122.gif +files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image87.gif +image3.jpg +files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image33.gif image194.jpg image183.jpg +image53.gif image172.jpg -image44.gif +image42.gif 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 +image89.jpg +image78.jpg +image20.gif +image67.jpg +image56.jpg +image23.jpg +image12.jpg +files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image88.gif +files\salome2_sp3_booleangui_functions_salome2_sp3_booleangui_functions_image1.gif +files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image34.gif image184.jpg image173.jpg image151.jpg +image32.gif image140.jpg -image23.gif -image59.jpg -image26.jpg -image12.gif -image15.jpg +image79.jpg +image21.gif +image68.jpg +image57.jpg +image24.jpg +image13.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 +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 -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 +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 -image25.gif image131.jpg +image23.gif image120.jpg -image28.jpg -image14.gif -image17.jpg +image59.jpg +image26.jpg +image12.gif +image15.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 +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 -image37.gif +image35.gif image132.jpg +image24.gif image121.jpg image110.jpg -image15.gif -image29.jpg -image18.jpg +image27.jpg +image13.gif +image16.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 +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 -image49.gif image166.jpg image144.jpg image133.jpg +image25.gif image122.jpg image111.jpg image100.jpg -image90.jpg -image16.gif -image19.jpg +image28.jpg +image14.gif +image17.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 +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 -image91.jpg -image80.jpg -image17.gif +image15.gif +image29.jpg +image18.jpg 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 +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 -image29.gif +image49.gif image168.jpg image146.jpg image135.jpg image124.jpg image113.jpg image102.jpg -image92.jpg -image81.jpg -image70.jpg +image90.jpg +image16.gif +image19.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 +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 +salome2_sp3_buildgui_functions_salome2_sp3_buildgui_functions_image17.gif +image202.jpg image169.jpg image158.jpg image147.jpg image136.jpg image125.jpg image103.jpg -image93.jpg -image82.jpg -image71.jpg -image19.gif -image60.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 -image94.jpg -image83.jpg -image72.jpg -image61.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 -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 +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 -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 +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 -image97.jpg -image86.jpg -image75.jpg -image53.jpg -image20.jpg -files\salome2_sp3_operationgui_functions_salome2_sp3_operationgui_functions_image89.gif -files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image53.gif -files\salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image29.gif +image95.jpg +image84.jpg +image73.jpg +image62.jpg +image51.jpg image190.jpg -image51.gif image119.jpg image108.jpg -image98.jpg -image87.jpg -image76.jpg -image65.jpg -image54.jpg -image21.jpg -image10.jpg -files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image71.gif -files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image54.gif -image191.jpg -image180.jpg -image52.gif -image41.gif -image109.jpg -image99.jpg -image88.jpg -image66.jpg -image55.jpg -image22.jpg -image11.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_measuregui_functions_salome2_sp3_measuregui_functions_image72.gif -files\salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image55.gif -image192.jpg -image181.jpg -image53.gif -image170.jpg -image42.gif -image89.jpg -image78.jpg -image20.gif -image67.jpg -image56.jpg -image23.jpg -image12.jpg -files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image131.gif -files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image73.gif -image193.jpg -image182.jpg -image171.jpg -image160.jpg -image32.gif -image79.jpg -image21.gif -image68.jpg -image57.jpg -image24.jpg -image13.jpg -files\salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image132.gif -files\salome2_sp3_measuregui_functions_salome2_sp3_measuregui_functions_image74.gif -image3.jpg +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_help_csh.html -geom_help_rhc.html +geom.html +geom_csh.html +geom_rhc.html diff --git a/doc/salome/gui/GEOM/blocks.htm b/doc/salome/gui/GEOM/blocks.htm index 5847850ac..ce53dbc61 100755 --- a/doc/salome/gui/GEOM/blocks.htm +++ b/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(); diff --git a/doc/salome/gui/GEOM/changing_displaying_parameters.htm b/doc/salome/gui/GEOM/changing_displaying_parameters.htm index ee420e3d6..db074bc3b 100755 --- a/doc/salome/gui/GEOM/changing_displaying_parameters.htm +++ b/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(); diff --git a/doc/salome/gui/GEOM/files/introduction_to_geom.htm b/doc/salome/gui/GEOM/files/introduction_to_geom.htm index 3f411c631..1b5797f4b 100755 --- a/doc/salome/gui/GEOM/files/introduction_to_geom.htm +++ b/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(); 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 fcc095a1f..dc3c7060b 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm @@ -29,8 +29,8 @@ - - + + @@ -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;} -img_whs9 {border-style: none; border: none; width: 200px; height: 176px;} -p.whs10 {color: #808080; font-size: 12pt;} -p.whs11 {font-size: 12pt; color: #000000;} -p.whs12 {color: #808080; font-size: 12pt; margin-left: 40px;} -img_whs13 {border-style: none; border: none; width: 150px; height: 140px;} -img_whs14 {border-style: none; border: none; width: 150px; height: 139px;} -img_whs15 {border-style: none; border: none; width: 200px; height: 193px;} -img_whs16 {border-style: none; border: none; width: 150px; height: 129px;} -img_whs17 {border-style: none; border: none; width: 200px; height: 211px;} -p.whs18 {font-size: 12pt; margin-left: 40px; font-weight: bold;} -img_whs19 {border-style: none; border: none; width: 150px; height: 154px;} -img_whs20 {border-style: none; border: none; width: 200px; height: 202px;} -img_whs21 {border-style: none; border: none; width: 150px; height: 123px;} -p.whs22 {font-size: 14pt;} -img_whs23 {border-style: none; border: none; width: 20px; height: 20px;} -img_whs24 {border-style: none; border: none; width: 200px; height: 194px;} -p.whs25 {font-size: 12pt; font-weight: bold;} -p.whs26 {font-size: 12pt; font-weight: bold; font-style: italic; x-text-underline: off; /*begin!kadov{{*/ text-decoration: none; /*}}end!kadov*/ } -img_whs27 {border-style: none; border: none; width: 200px; height: 181px; float: none;} -img_whs28 {border-style: none; border: none; width: 175px; height: 181px;} -img_whs29 {border-style: none; border: none; width: 203px; height: 181px;} -img_whs30 {border-style: none; border: none; width: 200px; height: 175px;} -img_whs31 {border-style: none; border: none; width: 150px; height: 128px;} -img_whs32 {border-style: none; border: none; width: 200px; height: 192px;} -p.whs33 {font-size: 12pt; font-weight: bold; color: #000000;} -img_whs34 {border-style: none; border: none; width: 150px; height: 131px;} -p.whs35 {margin-left: 40px; font-size: 12pt;} -img_whs36 {border-style: none; border: none; width: 200px; height: 162px;} -p.whs37 {font-size: 12pt; margin-left: 40px; font-weight: bold; text-indent: -40px;} -img_whs38 {border-style: none; border: none; width: 16px; height: 16px;} -p.whs39 {margin-left: 40px; font-weight: bold; text-indent: -40px; font-size: 14pt;} -p.whs40 {font-weight: bold; text-indent: -40px; font-size: 14pt; margin-left: 80px;} -img_whs41 {border-style: none; border: none; width: 200px; height: 185px;} -p.whs42 {font-weight: bold; margin-left: 80px; text-indent: -80px; font-size: 12pt;} -p.whs43 {font-weight: bold; text-indent: -80px; font-size: 12pt; margin-left: 120px;} -img_whs44 {border-style: none; border: none; width: 200px; height: 219px;} +table.whs8 {x-cell-content-align: top; border-spacing: 0; width: 84.306%; border-spacing: 0px;} +col.whs9 {width: 33.333%;} +col.whs10 {width: 28.501%;} +col.whs11 {width: 31.796%;} +tr.whs12 {x-cell-content-align: top;} +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: 218px; height: 250px;} +td.whs15 {width: 28.501%; padding-right: 10px; padding-left: 10px; border-right-style: none; border-top-style: none; border-bottom-style: none;} +p.whs16 {font-size: 12pt; margin-right: 0px;} +img_whs17 {border-style: none; border: none; width: 150px; height: 250px;} +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: 170px; height: 250px;} +p.whs20 {font-size: 12pt; margin-left: 40px;} +p.whs21 {color: #808080; font-size: 12pt;} +p.whs22 {font-size: 12pt; color: #000000;} +p.whs23 {color: #808080; font-size: 12pt; margin-left: 40px;} +img_whs24 {border-style: none; border: none; width: 150px; height: 140px;} +img_whs25 {border-style: none; border: none; width: 200px; height: 176px;} +img_whs26 {border-style: none; border: none; width: 150px; height: 139px;} +table.whs27 {x-cell-content-align: top; border-spacing: 0; width: 65.278%; border-spacing: 0px;} +col.whs28 {width: 50.213%;} +col.whs29 {width: 49.787%;} +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: 212px; height: 250px;} +td.whs32 {width: 49.787%; padding-right: 10px; padding-left: 10px; border-top-style: none; border-bottom-style: none; border-right-style: none;} +img_whs33 {border-style: none; border: none; width: 211px; height: 250px;} +img_whs34 {border-style: none; border: none; width: 150px; height: 129px;} +img_whs35 {border-style: none; border: none; width: 200px; height: 211px;} +p.whs36 {font-size: 12pt; margin-left: 40px; font-weight: bold;} +img_whs37 {border-style: none; border: none; width: 150px; height: 154px;} +img_whs38 {border-style: none; border: none; width: 200px; height: 202px;} +img_whs39 {border-style: none; border: none; width: 150px; height: 123px;} +p.whs40 {font-size: 14pt;} +img_whs41 {border-style: none; border: none; width: 20px; height: 20px;} +img_whs42 {border-style: none; border: none; width: 200px; height: 194px;} +p.whs43 {font-size: 12pt; font-weight: bold;} +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;} -->