From b28bc3d5c298bd73086065978a790c0f22636ee0 Mon Sep 17 00:00:00 2001 From: abd Date: Wed, 14 Jun 2006 08:32:22 +0000 Subject: [PATCH] Merge from BR_DEBUG_3_2_0b1 --- doc/salome/gui/GEOM/ehlpdhtm.js | 8476 ++++++++--------- .../gui/GEOM/files/introduction_to_geom.htm | 285 +- .../files/salome2_sp3_basicgui_functions.htm | 885 -- ...salome2_sp3_basicgui_functions_image28.gif | Bin 904 -> 0 bytes .../salome2_sp3_booleangui_functions.htm | 312 +- .../files/salome2_sp3_buildgui_functions.htm | 458 - .../salome2_sp3_displaygui_functions.htm | 225 - ...lome2_sp3_displaygui_functions_image51.gif | Bin 946 -> 0 bytes ...lome2_sp3_displaygui_functions_image52.gif | Bin 958 -> 0 bytes ...lome2_sp3_displaygui_functions_image53.gif | Bin 950 -> 0 bytes ...lome2_sp3_displaygui_functions_image54.gif | Bin 994 -> 0 bytes ...lome2_sp3_displaygui_functions_image55.gif | Bin 987 -> 0 bytes .../salome2_sp3_generationgui_functions.htm | 307 - .../salome2_sp3_geomtoolsgui_functions.htm | 287 +- .../salome2_sp3_measuregui_functions.htm | 1104 +-- .../salome2_sp3_operationgui_functions.htm | 637 -- .../salome2_sp3_primitivegui_functions.htm | 395 - .../files/salome2_sp3_repairgui_functions.htm | 898 -- ...alome2_sp3_transformationgui_functions.htm | 669 -- ...3_transformationgui_functions_image130.gif | Bin 935 -> 0 bytes .../geompy_doc/GEOM__TestMeasures_8py.html | 29 - doc/salome/gui/GEOM/geompy_doc/doxygen.png | Bin 1576 -> 0 bytes .../gui/GEOM/geompy_doc/geompy_8py__incl.jpg | Bin 4582 -> 0 bytes .../gui/GEOM/geompy_doc/geompy_8py__incl.map | 1 - .../gui/GEOM/geompy_doc/geompy_8py__incl.md5 | 1 - .../namespaceGEOM__TestMeasures.html | 70 - .../gui/GEOM/geompy_doc/namespacegeompy.html | 6320 ++++++------ doc/salome/gui/GEOM/pics/arc.png | Bin 11731 -> 11730 bytes doc/salome/gui/GEOM/pics/archimede.png | Bin 15311 -> 15309 bytes doc/salome/gui/GEOM/pics/archimedesn1.png | Bin 3678 -> 3677 bytes doc/salome/gui/GEOM/pics/archimedesn2.png | Bin 4140 -> 4139 bytes doc/salome/gui/GEOM/pics/archimedesn3.png | Bin 1841 -> 1840 bytes doc/salome/gui/GEOM/pics/arcsn.png | Bin 1672 -> 1671 bytes doc/salome/gui/GEOM/pics/bezier.png | Bin 2442 -> 2441 bytes doc/salome/gui/GEOM/pics/block1.png | Bin 15732 -> 15729 bytes doc/salome/gui/GEOM/pics/block2.png | Bin 14326 -> 14324 bytes doc/salome/gui/GEOM/pics/block3.png | Bin 15635 -> 15634 bytes doc/salome/gui/GEOM/pics/block4.png | Bin 13453 -> 13452 bytes doc/salome/gui/GEOM/pics/block5.png | Bin 16710 -> 16709 bytes doc/salome/gui/GEOM/pics/block_explodesn.png | Bin 17436 -> 17434 bytes doc/salome/gui/GEOM/pics/bool1.png | Bin 12677 -> 12676 bytes doc/salome/gui/GEOM/pics/bool2.png | Bin 13285 -> 13284 bytes doc/salome/gui/GEOM/pics/bool3.png | Bin 13184 -> 13183 bytes doc/salome/gui/GEOM/pics/box1.png | Bin 11772 -> 11770 bytes doc/salome/gui/GEOM/pics/box2.png | Bin 12087 -> 12086 bytes doc/salome/gui/GEOM/pics/boxes.png | Bin 7689 -> 7688 bytes doc/salome/gui/GEOM/pics/chamfer1.png | Bin 13428 -> 13427 bytes doc/salome/gui/GEOM/pics/chamfer2.png | Bin 15527 -> 15526 bytes doc/salome/gui/GEOM/pics/chamfer3.png | Bin 15147 -> 15146 bytes doc/salome/gui/GEOM/pics/chamfer_all.png | Bin 11172 -> 11171 bytes doc/salome/gui/GEOM/pics/chamfer_edge.png | Bin 9146 -> 9145 bytes doc/salome/gui/GEOM/pics/chamfer_faces.png | Bin 10302 -> 10301 bytes doc/salome/gui/GEOM/pics/circle1.png | Bin 12982 -> 12979 bytes doc/salome/gui/GEOM/pics/circle2.png | Bin 12343 -> 12341 bytes doc/salome/gui/GEOM/pics/circles.png | Bin 3217 -> 3216 bytes doc/salome/gui/GEOM/pics/clipping.png | Bin 12933 -> 12930 bytes doc/salome/gui/GEOM/pics/colorsn.png | Bin 23078 -> 23077 bytes doc/salome/gui/GEOM/pics/commonsn.png | Bin 3754 -> 3753 bytes doc/salome/gui/GEOM/pics/compoundsn.png | Bin 1653 -> 1652 bytes doc/salome/gui/GEOM/pics/cone1.png | Bin 14640 -> 14639 bytes doc/salome/gui/GEOM/pics/cone2.png | Bin 13421 -> 13420 bytes doc/salome/gui/GEOM/pics/cones.png | Bin 10676 -> 10675 bytes doc/salome/gui/GEOM/pics/creategroup.png | Bin 15350 -> 0 bytes doc/salome/gui/GEOM/pics/curve.png | Bin 11543 -> 11542 bytes doc/salome/gui/GEOM/pics/cutsn.png | Bin 4941 -> 4940 bytes doc/salome/gui/GEOM/pics/cylinder1.png | Bin 14719 -> 14718 bytes doc/salome/gui/GEOM/pics/cylinder2.png | Bin 13539 -> 13538 bytes doc/salome/gui/GEOM/pics/cylinders.png | Bin 12964 -> 12963 bytes doc/salome/gui/GEOM/pics/disp_mode1sn.png | Bin 8130 -> 8129 bytes doc/salome/gui/GEOM/pics/disp_mode2sn.png | Bin 20528 -> 20527 bytes doc/salome/gui/GEOM/pics/distance.png | Bin 12635 -> 12634 bytes doc/salome/gui/GEOM/pics/edgesn.png | Bin 1592 -> 1591 bytes doc/salome/gui/GEOM/pics/editgroup.png | Bin 15719 -> 15718 bytes doc/salome/gui/GEOM/pics/ellipse.png | Bin 13550 -> 13549 bytes doc/salome/gui/GEOM/pics/ellipsesn.png | Bin 2931 -> 2930 bytes doc/salome/gui/GEOM/pics/export.png | Bin 14172 -> 0 bytes doc/salome/gui/GEOM/pics/extrusion.png | Bin 13393 -> 13391 bytes doc/salome/gui/GEOM/pics/facesn1.png | Bin 3142 -> 3141 bytes doc/salome/gui/GEOM/pics/facesn2.png | Bin 2964 -> 2963 bytes doc/salome/gui/GEOM/pics/facesn3.png | Bin 2187 -> 2186 bytes doc/salome/gui/GEOM/pics/fillet1.png | Bin 12606 -> 12605 bytes doc/salome/gui/GEOM/pics/fillet2.png | Bin 14015 -> 14014 bytes doc/salome/gui/GEOM/pics/fillet3.png | Bin 13897 -> 13895 bytes doc/salome/gui/GEOM/pics/fillet_all.png | Bin 12664 -> 12663 bytes doc/salome/gui/GEOM/pics/fillet_edge.png | Bin 10707 -> 10706 bytes doc/salome/gui/GEOM/pics/fillet_prism.png | Bin 8424 -> 8423 bytes doc/salome/gui/GEOM/pics/filling.png | Bin 15332 -> 15331 bytes .../gui/GEOM/pics/filling_compoundsn.png | Bin 2507 -> 2506 bytes doc/salome/gui/GEOM/pics/fillingsn.png | Bin 9402 -> 9400 bytes doc/salome/gui/GEOM/pics/free_boudaries1.png | Bin 12909 -> 12908 bytes doc/salome/gui/GEOM/pics/free_boudaries2.png | Bin 13074 -> 13073 bytes doc/salome/gui/GEOM/pics/free_faces1.png | Bin 19590 -> 19589 bytes doc/salome/gui/GEOM/pics/free_faces2.png | Bin 22272 -> 22271 bytes doc/salome/gui/GEOM/pics/fusesn1.png | Bin 14030 -> 14029 bytes doc/salome/gui/GEOM/pics/fusesn2.png | Bin 16678 -> 16676 bytes doc/salome/gui/GEOM/pics/geomcreategroup.png | Bin 16179 -> 16178 bytes doc/salome/gui/GEOM/pics/geomexport.png | Bin 15829 -> 15827 bytes doc/salome/gui/GEOM/pics/geomimport.png | Bin 15403 -> 15402 bytes doc/salome/gui/GEOM/pics/glue_faces1.png | Bin 9842 -> 9839 bytes doc/salome/gui/GEOM/pics/glue_faces2.png | Bin 9914 -> 9913 bytes doc/salome/gui/GEOM/pics/import.png | Bin 15937 -> 0 bytes doc/salome/gui/GEOM/pics/interpol.png | Bin 2888 -> 2887 bytes doc/salome/gui/GEOM/pics/isos_u12_v12sn.png | Bin 37129 -> 37127 bytes doc/salome/gui/GEOM/pics/line.png | Bin 10742 -> 10740 bytes doc/salome/gui/GEOM/pics/lines.png | Bin 2403 -> 2402 bytes doc/salome/gui/GEOM/pics/measures1.png | Bin 10455 -> 10454 bytes doc/salome/gui/GEOM/pics/measures10.png | Bin 14601 -> 14600 bytes doc/salome/gui/GEOM/pics/measures3.png | Bin 14450 -> 14448 bytes doc/salome/gui/GEOM/pics/measures4.png | Bin 17751 -> 17750 bytes doc/salome/gui/GEOM/pics/measures5.png | Bin 14641 -> 14640 bytes doc/salome/gui/GEOM/pics/measures8.png | Bin 16541 -> 16540 bytes doc/salome/gui/GEOM/pics/measures9.png | Bin 12534 -> 12533 bytes doc/salome/gui/GEOM/pics/mirror_axissn1.png | Bin 2248 -> 2247 bytes doc/salome/gui/GEOM/pics/mirror_axissn2.png | Bin 3543 -> 3542 bytes doc/salome/gui/GEOM/pics/mirror_planesn1.png | Bin 4646 -> 4645 bytes doc/salome/gui/GEOM/pics/mirror_planesn2.png | Bin 5798 -> 5797 bytes doc/salome/gui/GEOM/pics/mirror_pointsn1.png | Bin 2304 -> 2303 bytes doc/salome/gui/GEOM/pics/mirror_pointsn2.png | Bin 3739 -> 3738 bytes doc/salome/gui/GEOM/pics/mtrans1.png | Bin 15971 -> 15970 bytes doc/salome/gui/GEOM/pics/mtrans2.png | Bin 19494 -> 19493 bytes doc/salome/gui/GEOM/pics/mtransf1.png | Bin 17130 -> 17129 bytes doc/salome/gui/GEOM/pics/mtransf2.png | Bin 20345 -> 20344 bytes doc/salome/gui/GEOM/pics/mtransf3.png | Bin 13844 -> 13843 bytes doc/salome/gui/GEOM/pics/mtransf4.png | Bin 9687 -> 9685 bytes .../gui/GEOM/pics/multi_rotation1d1.png | Bin 4300 -> 4299 bytes .../gui/GEOM/pics/multi_rotation1d2.png | Bin 8111 -> 8110 bytes .../gui/GEOM/pics/multi_rotation2d1.png | Bin 3139 -> 3138 bytes .../gui/GEOM/pics/multi_rotation2d2.png | Bin 16745 -> 16744 bytes .../GEOM/pics/multi_transformationsn1d.png | Bin 11030 -> 11027 bytes .../GEOM/pics/multi_transformationsn2d.png | Bin 11515 -> 11514 bytes .../gui/GEOM/pics/multi_translation1dsn.png | Bin 3938 -> 3937 bytes .../gui/GEOM/pics/multi_translation2dsn.png | Bin 7838 -> 7837 bytes .../GEOM/pics/multi_translation_initialsn.png | Bin 2158 -> 2157 bytes doc/salome/gui/GEOM/pics/neo-basicprop.png | Bin 14586 -> 14585 bytes doc/salome/gui/GEOM/pics/neo-detect2.png | Bin 8014 -> 8013 bytes doc/salome/gui/GEOM/pics/neo-isos.png | Bin 7042 -> 7041 bytes doc/salome/gui/GEOM/pics/neo-localcs1.png | Bin 17595 -> 17594 bytes doc/salome/gui/GEOM/pics/neo-localcs2.png | Bin 13085 -> 13084 bytes doc/salome/gui/GEOM/pics/neo-localcs3.png | Bin 15322 -> 15321 bytes doc/salome/gui/GEOM/pics/neo-materials.png | Bin 12972 -> 12971 bytes doc/salome/gui/GEOM/pics/neo-mrot1.png | Bin 14401 -> 14400 bytes doc/salome/gui/GEOM/pics/neo-mrot2.png | Bin 17583 -> 17582 bytes doc/salome/gui/GEOM/pics/neo-obj1.png | Bin 13245 -> 13244 bytes doc/salome/gui/GEOM/pics/neo-obj2.png | Bin 11136 -> 11135 bytes doc/salome/gui/GEOM/pics/neo-obj3.png | Bin 11942 -> 11941 bytes doc/salome/gui/GEOM/pics/neo-obj4.png | Bin 12077 -> 12076 bytes doc/salome/gui/GEOM/pics/neo-obj5.png | Bin 11148 -> 11147 bytes doc/salome/gui/GEOM/pics/neo-obj6.png | Bin 12508 -> 12507 bytes doc/salome/gui/GEOM/pics/neo-obj7.png | Bin 11911 -> 11909 bytes doc/salome/gui/GEOM/pics/neo-point2.png | Bin 15656 -> 15655 bytes doc/salome/gui/GEOM/pics/neo-scetcher1.png | Bin 16921 -> 16920 bytes doc/salome/gui/GEOM/pics/neo-scetcher2.png | Bin 21323 -> 21321 bytes doc/salome/gui/GEOM/pics/neo-section.png | Bin 13547 -> 13546 bytes doc/salome/gui/GEOM/pics/neo-transparency.png | Bin 6912 -> 6911 bytes doc/salome/gui/GEOM/pics/new-tolerance.png | Bin 14146 -> 14144 bytes doc/salome/gui/GEOM/pics/offsetsn.png | Bin 12215 -> 12214 bytes doc/salome/gui/GEOM/pics/partition1.png | Bin 19008 -> 19007 bytes doc/salome/gui/GEOM/pics/partition2.png | Bin 15665 -> 15664 bytes doc/salome/gui/GEOM/pics/partitionsn1.png | Bin 5814 -> 5813 bytes doc/salome/gui/GEOM/pics/partitionsn2.png | Bin 4535 -> 4534 bytes doc/salome/gui/GEOM/pics/pipe.png | Bin 12462 -> 12459 bytes doc/salome/gui/GEOM/pics/pipe_wire_edgesn.png | Bin 2000 -> 1999 bytes doc/salome/gui/GEOM/pics/pipesn.png | Bin 11225 -> 11224 bytes doc/salome/gui/GEOM/pics/plane1.png | Bin 13114 -> 13113 bytes doc/salome/gui/GEOM/pics/plane2.png | Bin 13745 -> 13744 bytes doc/salome/gui/GEOM/pics/plane3.png | Bin 12545 -> 12544 bytes doc/salome/gui/GEOM/pics/plane_on_face.png | Bin 2595 -> 2594 bytes doc/salome/gui/GEOM/pics/planes1.png | Bin 4168 -> 4166 bytes doc/salome/gui/GEOM/pics/point1.png | Bin 12028 -> 12026 bytes doc/salome/gui/GEOM/pics/point3.png | Bin 14515 -> 14514 bytes doc/salome/gui/GEOM/pics/points.png | Bin 2941 -> 2940 bytes doc/salome/gui/GEOM/pics/polyline.png | Bin 2813 -> 2812 bytes doc/salome/gui/GEOM/pics/prisms_basessn.png | Bin 2654 -> 2653 bytes doc/salome/gui/GEOM/pics/prismssn.png | Bin 7628 -> 7627 bytes doc/salome/gui/GEOM/pics/repair1.png | Bin 21190 -> 21189 bytes doc/salome/gui/GEOM/pics/repair10.png | Bin 7422 -> 7421 bytes doc/salome/gui/GEOM/pics/repair2.png | Bin 12670 -> 12668 bytes doc/salome/gui/GEOM/pics/repair3.png | Bin 15621 -> 15620 bytes doc/salome/gui/GEOM/pics/repair4.png | Bin 15084 -> 15083 bytes doc/salome/gui/GEOM/pics/repair5.png | Bin 14981 -> 14980 bytes doc/salome/gui/GEOM/pics/repair6.png | Bin 15032 -> 15031 bytes doc/salome/gui/GEOM/pics/repair7.png | Bin 12358 -> 12356 bytes doc/salome/gui/GEOM/pics/repair8.png | Bin 14096 -> 14095 bytes doc/salome/gui/GEOM/pics/repair9.png | Bin 9956 -> 9955 bytes doc/salome/gui/GEOM/pics/revolution.png | Bin 14251 -> 14250 bytes doc/salome/gui/GEOM/pics/revolutionsn.png | Bin 8811 -> 8810 bytes doc/salome/gui/GEOM/pics/rotationsn1.png | Bin 7114 -> 7113 bytes doc/salome/gui/GEOM/pics/rotationsn2.png | Bin 10612 -> 10611 bytes .../gui/GEOM/pics/scale_transformsn1.png | Bin 4218 -> 4217 bytes .../gui/GEOM/pics/scale_transformsn2.png | Bin 6158 -> 6157 bytes doc/salome/gui/GEOM/pics/sectionsn.png | Bin 1911 -> 1910 bytes doc/salome/gui/GEOM/pics/shellsn.png | Bin 2772 -> 2771 bytes doc/salome/gui/GEOM/pics/solidsn.png | Bin 4965 -> 4964 bytes doc/salome/gui/GEOM/pics/sphere1.png | Bin 12869 -> 12867 bytes doc/salome/gui/GEOM/pics/sphere2.png | Bin 12115 -> 12113 bytes doc/salome/gui/GEOM/pics/spheres.png | Bin 17852 -> 17851 bytes doc/salome/gui/GEOM/pics/supp_int_wires1.png | Bin 13116 -> 13115 bytes doc/salome/gui/GEOM/pics/supp_int_wires2.png | Bin 8364 -> 8363 bytes doc/salome/gui/GEOM/pics/suppress_faces1.png | Bin 6169 -> 6168 bytes doc/salome/gui/GEOM/pics/suppress_faces2.png | Bin 6653 -> 6652 bytes doc/salome/gui/GEOM/pics/torus1.png | Bin 13801 -> 13800 bytes doc/salome/gui/GEOM/pics/torus2.png | Bin 12610 -> 12609 bytes doc/salome/gui/GEOM/pics/toruses.png | Bin 22148 -> 22147 bytes doc/salome/gui/GEOM/pics/transformation1.png | Bin 14766 -> 14765 bytes doc/salome/gui/GEOM/pics/transformation10.png | Bin 13674 -> 13673 bytes doc/salome/gui/GEOM/pics/transformation11.png | Bin 12912 -> 12911 bytes doc/salome/gui/GEOM/pics/transformation2.png | Bin 14864 -> 14863 bytes doc/salome/gui/GEOM/pics/transformation3.png | Bin 14406 -> 14405 bytes doc/salome/gui/GEOM/pics/transformation4.png | Bin 14979 -> 14978 bytes doc/salome/gui/GEOM/pics/transformation5.png | Bin 14553 -> 14552 bytes doc/salome/gui/GEOM/pics/transformation6.png | Bin 15455 -> 15453 bytes doc/salome/gui/GEOM/pics/transformation7.png | Bin 13562 -> 13561 bytes doc/salome/gui/GEOM/pics/transformation8.png | Bin 13701 -> 13700 bytes doc/salome/gui/GEOM/pics/transformation9.png | Bin 13736 -> 13734 bytes doc/salome/gui/GEOM/pics/translationsn1.png | Bin 6613 -> 6612 bytes doc/salome/gui/GEOM/pics/translationsn2.png | Bin 11303 -> 11302 bytes doc/salome/gui/GEOM/pics/transparencysn.png | Bin 28364 -> 28363 bytes doc/salome/gui/GEOM/pics/vector1.png | Bin 11853 -> 11851 bytes doc/salome/gui/GEOM/pics/vector2.png | Bin 13267 -> 13266 bytes doc/salome/gui/GEOM/pics/vectors.png | Bin 2404 -> 2403 bytes doc/salome/gui/GEOM/pics/wiresn.png | Bin 1956 -> 1955 bytes doc/salome/gui/GEOM/pics/workplane4.png | Bin 11002 -> 11000 bytes doc/salome/gui/GEOM/pics/workplane5.png | Bin 12268 -> 12267 bytes doc/salome/gui/GEOM/pics/workplane6.png | Bin 11761 -> 11760 bytes doc/salome/gui/GEOM/webhelp.jar | Bin 134517 -> 134515 bytes doc/salome/gui/GEOM/whdata/whftdata.js | 48 +- doc/salome/gui/GEOM/whdata/whftdata0.htm | 209 +- doc/salome/gui/GEOM/whdata/whfts.htm | 34 +- doc/salome/gui/GEOM/whdata/whfts.js | 80 +- doc/salome/gui/GEOM/whdata/whfwdata.js | 72 +- doc/salome/gui/GEOM/whdata/whfwdata0.htm | 2641 ++--- doc/salome/gui/GEOM/whdata/whgdata.js | 50 +- doc/salome/gui/GEOM/whdata/whgdata0.htm | 66 +- doc/salome/gui/GEOM/whdata/whglo.htm | 30 +- doc/salome/gui/GEOM/whdata/whglo.js | 68 +- doc/salome/gui/GEOM/whdata/whidata.js | 176 +- doc/salome/gui/GEOM/whdata/whidx.htm | 28 +- doc/salome/gui/GEOM/whdata/whidx.js | 68 +- doc/salome/gui/GEOM/whdata/whtdata.js | 126 +- doc/salome/gui/GEOM/whdata/whtdata0.htm | 227 +- doc/salome/gui/GEOM/whdata/whtoc.htm | 30 +- doc/salome/gui/GEOM/whdata/whtoc.js | 60 +- doc/salome/gui/GEOM/whgdata/whlstf0.htm | 92 +- doc/salome/gui/GEOM/whgdata/whlstf1.htm | 86 +- doc/salome/gui/GEOM/whgdata/whlstf10.htm | 84 +- doc/salome/gui/GEOM/whgdata/whlstf11.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstf12.htm | 88 +- doc/salome/gui/GEOM/whgdata/whlstf13.htm | 89 +- doc/salome/gui/GEOM/whgdata/whlstf14.htm | 45 - doc/salome/gui/GEOM/whgdata/whlstf15.htm | 48 - doc/salome/gui/GEOM/whgdata/whlstf2.htm | 86 +- doc/salome/gui/GEOM/whgdata/whlstf3.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstf4.htm | 86 +- doc/salome/gui/GEOM/whgdata/whlstf5.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstf6.htm | 96 +- doc/salome/gui/GEOM/whgdata/whlstf7.htm | 88 +- doc/salome/gui/GEOM/whgdata/whlstf8.htm | 86 +- doc/salome/gui/GEOM/whgdata/whlstf9.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl0.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl1.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl10.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl11.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl12.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl13.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl14.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl15.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl16.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl17.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl18.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl19.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl2.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl20.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl21.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl22.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl23.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl24.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl25.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl26.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl3.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl4.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl5.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl6.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl7.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl8.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstfl9.htm | 90 +- doc/salome/gui/GEOM/whgdata/whlstg0.htm | 150 +- doc/salome/gui/GEOM/whgdata/whlsti0.htm | 78 +- doc/salome/gui/GEOM/whgdata/whlstt0.htm | 102 +- doc/salome/gui/GEOM/whgdata/whlstt1.htm | 116 +- doc/salome/gui/GEOM/whgdata/whlstt10.htm | 133 +- doc/salome/gui/GEOM/whgdata/whlstt11.htm | 141 +- doc/salome/gui/GEOM/whgdata/whlstt12.htm | 139 +- doc/salome/gui/GEOM/whgdata/whlstt13.htm | 139 +- doc/salome/gui/GEOM/whgdata/whlstt14.htm | 136 +- doc/salome/gui/GEOM/whgdata/whlstt15.htm | 131 +- doc/salome/gui/GEOM/whgdata/whlstt16.htm | 136 +- doc/salome/gui/GEOM/whgdata/whlstt17.htm | 67 - doc/salome/gui/GEOM/whgdata/whlstt2.htm | 125 +- doc/salome/gui/GEOM/whgdata/whlstt3.htm | 139 +- doc/salome/gui/GEOM/whgdata/whlstt4.htm | 135 +- doc/salome/gui/GEOM/whgdata/whlstt5.htm | 144 +- doc/salome/gui/GEOM/whgdata/whlstt6.htm | 142 +- doc/salome/gui/GEOM/whgdata/whlstt7.htm | 133 +- doc/salome/gui/GEOM/whgdata/whlstt8.htm | 135 +- doc/salome/gui/GEOM/whgdata/whlstt9.htm | 128 +- doc/salome/gui/GEOM/whgdata/whnvf30.htm | 26 +- doc/salome/gui/GEOM/whgdata/whnvf31.htm | 30 +- doc/salome/gui/GEOM/whgdata/whnvf32.htm | 30 +- doc/salome/gui/GEOM/whgdata/whnvf33.htm | 30 +- doc/salome/gui/GEOM/whgdata/whnvl31.htm | 86 +- doc/salome/gui/GEOM/whgdata/whnvl32.htm | 144 +- doc/salome/gui/GEOM/whgdata/whnvl33.htm | 144 +- doc/salome/gui/GEOM/whgdata/whnvp30.htm | 30 +- doc/salome/gui/GEOM/whgdata/whnvp31.htm | 30 +- doc/salome/gui/GEOM/whgdata/whnvp32.htm | 30 +- doc/salome/gui/GEOM/whgdata/whnvp33.htm | 30 +- doc/salome/gui/GEOM/whgdata/whnvt30.htm | 94 +- doc/salome/gui/GEOM/whgdata/whnvt31.htm | 90 +- doc/salome/gui/GEOM/whgdata/whnvt32.htm | 90 +- doc/salome/gui/GEOM/whgdata/whnvt33.htm | 90 +- doc/salome/gui/GEOM/whproj.htm | 46 +- doc/salome/gui/GEOM/whproj.xml | 6 +- doc/salome/gui/GEOM/whxdata/whftdata0.xml | 181 +- doc/salome/gui/GEOM/whxdata/whfts.xml | 14 +- doc/salome/gui/GEOM/whxdata/whfwdata0.xml | 2613 ++--- doc/salome/gui/GEOM/whxdata/whgdata0.xml | 44 +- doc/salome/gui/GEOM/whxdata/whglo.xml | 8 +- doc/salome/gui/GEOM/whxdata/whidx.xml | 8 +- doc/salome/gui/GEOM/whxdata/whtdata0.xml | 238 +- doc/salome/gui/GEOM/whxdata/whtoc.xml | 8 +- doc/salome/tui/GEOM/doxyfile | 200 - doc/salome/tui/GEOM/doxyfile_py | 200 - .../tui/GEOM/sources/Application-About.png | Bin 19226 -> 19225 bytes doc/salome/tui/GEOM/sources/bg_salome.gif | Bin 17294 -> 17293 bytes doc/salome/tui/GEOM/sources/myheader.html | 13 +- .../tui/GEOM/sources/static/doxygen.css | 153 +- doc/salome/tui/GEOM/sources/static/tree.js | 59 - doc/salome/tui/Makefile.in | 72 +- src/ARCHIMEDE/Archimede_VolumeSection.cxx | 2 +- src/ARCHIMEDE/Archimede_VolumeSection.hxx | 2 +- src/ARCHIMEDE/Makefile.in | 8 +- src/BREPExport/BREPExport.cxx | 2 +- src/BREPExport/Makefile.in | 8 +- src/BREPImport/BREPImport.cxx | 3 +- src/BREPImport/Makefile.in | 8 +- src/BasicGUI/BasicGUI.cxx | 42 +- src/BasicGUI/BasicGUI.h | 40 +- src/BasicGUI/BasicGUI_ArcDlg.cxx | 22 +- src/BasicGUI/BasicGUI_ArcDlg.h | 8 +- src/BasicGUI/BasicGUI_CircleDlg.cxx | 26 +- src/BasicGUI/BasicGUI_CircleDlg.h | 15 +- src/BasicGUI/BasicGUI_CurveDlg.cxx | 28 +- src/BasicGUI/BasicGUI_CurveDlg.h | 9 +- src/BasicGUI/BasicGUI_EllipseDlg.cxx | 27 +- src/BasicGUI/BasicGUI_EllipseDlg.h | 8 +- src/BasicGUI/BasicGUI_LineDlg.cxx | 23 +- src/BasicGUI/BasicGUI_LineDlg.h | 8 +- src/BasicGUI/BasicGUI_MarkerDlg.cxx | 18 +- src/BasicGUI/BasicGUI_MarkerDlg.h | 7 +- src/BasicGUI/BasicGUI_PlaneDlg.cxx | 29 +- src/BasicGUI/BasicGUI_PlaneDlg.h | 10 +- src/BasicGUI/BasicGUI_PointDlg.cxx | 170 +- src/BasicGUI/BasicGUI_PointDlg.h | 10 +- src/BasicGUI/BasicGUI_VectorDlg.cxx | 25 +- src/BasicGUI/BasicGUI_VectorDlg.h | 12 +- src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx | 37 +- src/BasicGUI/BasicGUI_WorkingPlaneDlg.h | 7 +- src/BasicGUI/Makefile.in | 6 +- src/BlocksGUI/BlocksGUI.cxx | 39 +- src/BlocksGUI/BlocksGUI.h | 2 +- src/BlocksGUI/BlocksGUI_BlockDlg.cxx | 18 +- src/BlocksGUI/BlocksGUI_BlockDlg.h | 6 +- src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx | 9 +- src/BlocksGUI/BlocksGUI_ExplodeDlg.h | 6 +- src/BlocksGUI/BlocksGUI_PropagateDlg.cxx | 40 +- src/BlocksGUI/BlocksGUI_PropagateDlg.h | 14 +- src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx | 20 +- src/BlocksGUI/BlocksGUI_QuadFaceDlg.h | 11 +- src/BlocksGUI/BlocksGUI_TrsfDlg.cxx | 26 +- src/BlocksGUI/BlocksGUI_TrsfDlg.h | 7 +- src/BlocksGUI/Makefile.in | 6 +- src/BooleanGUI/BooleanGUI.cxx | 4 +- src/BooleanGUI/BooleanGUI.h | 2 +- src/BooleanGUI/BooleanGUI_Dialog.cxx | 13 +- src/BooleanGUI/BooleanGUI_Dialog.h | 7 +- src/BooleanGUI/Makefile.in | 6 +- src/BuildGUI/BuildGUI.cxx | 14 +- src/BuildGUI/BuildGUI.h | 2 +- src/BuildGUI/BuildGUI_CompoundDlg.cxx | 10 +- src/BuildGUI/BuildGUI_CompoundDlg.h | 7 +- src/BuildGUI/BuildGUI_EdgeDlg.cxx | 10 +- src/BuildGUI/BuildGUI_EdgeDlg.h | 9 +- src/BuildGUI/BuildGUI_FaceDlg.cxx | 10 +- src/BuildGUI/BuildGUI_FaceDlg.h | 7 +- src/BuildGUI/BuildGUI_ShellDlg.cxx | 12 +- src/BuildGUI/BuildGUI_ShellDlg.h | 7 +- src/BuildGUI/BuildGUI_SolidDlg.cxx | 12 +- src/BuildGUI/BuildGUI_SolidDlg.h | 7 +- src/BuildGUI/BuildGUI_WireDlg.cxx | 10 +- src/BuildGUI/BuildGUI_WireDlg.h | 7 +- src/BuildGUI/Makefile.in | 6 +- src/DisplayGUI/DisplayGUI.cxx | 2 +- src/DisplayGUI/DisplayGUI.h | 2 +- src/DisplayGUI/Makefile.in | 6 +- src/DlgRef/DlgRef_1List1Spin1Btn_QTD.cxx | 2 +- src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel1Check1List_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel1Check1List_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel1Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel1Check_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel1Spin.cxx | 2 +- src/DlgRef/DlgRef_1Sel1Spin.h | 2 +- src/DlgRef/DlgRef_1Sel1Spin1Check.cxx | 2 +- src/DlgRef/DlgRef_1Sel1Spin1Check.h | 2 +- src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel1Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel1Spin_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel2Spin.cxx | 2 +- src/DlgRef/DlgRef_1Sel2Spin.h | 2 +- src/DlgRef/DlgRef_1Sel2Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel2Spin_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel3Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel3Check_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel3Spin.cxx | 2 +- src/DlgRef/DlgRef_1Sel3Spin.h | 2 +- src/DlgRef/DlgRef_1Sel3Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel3Spin_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel4Spin.cxx | 2 +- src/DlgRef/DlgRef_1Sel4Spin.h | 2 +- src/DlgRef/DlgRef_1Sel4Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel4Spin_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel5Spin.cxx | 2 +- src/DlgRef/DlgRef_1Sel5Spin.h | 2 +- src/DlgRef/DlgRef_1Sel5Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel5Spin_QTD.h | 2 +- src/DlgRef/DlgRef_1Sel_Ext.h | 2 +- src/DlgRef/DlgRef_1Sel_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Sel_QTD.h | 2 +- src/DlgRef/DlgRef_1Spin.cxx | 2 +- src/DlgRef/DlgRef_1Spin.h | 2 +- src/DlgRef/DlgRef_1Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_1Spin_QTD.h | 2 +- src/DlgRef/DlgRef_2Sel1Spin.cxx | 2 +- src/DlgRef/DlgRef_2Sel1Spin.h | 2 +- src/DlgRef/DlgRef_2Sel1Spin2Check.cxx | 2 +- src/DlgRef/DlgRef_2Sel1Spin2Check.h | 2 +- src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h | 2 +- src/DlgRef/DlgRef_2Sel1Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_2Sel1Spin_QTD.h | 2 +- src/DlgRef/DlgRef_2Sel2Spin.cxx | 2 +- src/DlgRef/DlgRef_2Sel2Spin.h | 2 +- src/DlgRef/DlgRef_2Sel2Spin1Check.cxx | 2 +- src/DlgRef/DlgRef_2Sel2Spin1Check.h | 2 +- src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h | 2 +- src/DlgRef/DlgRef_2Sel2Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_2Sel2Spin_QTD.h | 2 +- src/DlgRef/DlgRef_2Sel3Spin.cxx | 2 +- src/DlgRef/DlgRef_2Sel3Spin.h | 2 +- src/DlgRef/DlgRef_2Sel3Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_2Sel3Spin_QTD.h | 2 +- src/DlgRef/DlgRef_2Sel4Spin1Check.cxx | 2 +- src/DlgRef/DlgRef_2Sel4Spin1Check.h | 2 +- src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h | 2 +- src/DlgRef/DlgRef_2Sel_QTD.cxx | 2 +- src/DlgRef/DlgRef_2Sel_QTD.h | 2 +- src/DlgRef/DlgRef_2Spin.cxx | 2 +- src/DlgRef/DlgRef_2Spin.h | 2 +- src/DlgRef/DlgRef_2Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_2Spin_QTD.h | 2 +- src/DlgRef/DlgRef_3Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_3Check_QTD.h | 2 +- src/DlgRef/DlgRef_3Sel1Spin.cxx | 2 +- src/DlgRef/DlgRef_3Sel1Spin.h | 2 +- src/DlgRef/DlgRef_3Sel3Spin1Check.cxx | 2 +- src/DlgRef/DlgRef_3Sel3Spin1Check.h | 2 +- src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h | 2 +- src/DlgRef/DlgRef_3Sel4Spin2Check.cxx | 2 +- src/DlgRef/DlgRef_3Sel4Spin2Check.h | 2 +- src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h | 2 +- src/DlgRef/DlgRef_3Sel_QTD.cxx | 2 +- src/DlgRef/DlgRef_3Sel_QTD.h | 2 +- src/DlgRef/DlgRef_3Spin.cxx | 2 +- src/DlgRef/DlgRef_3Spin.h | 2 +- src/DlgRef/DlgRef_3Spin1Check.cxx | 2 +- src/DlgRef/DlgRef_3Spin1Check.h | 2 +- src/DlgRef/DlgRef_3Spin1Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_3Spin1Check_QTD.h | 2 +- src/DlgRef/DlgRef_3Spin_QTD.cxx | 2 +- src/DlgRef/DlgRef_3Spin_QTD.h | 2 +- src/DlgRef/DlgRef_4Sel1List1Check_QTD.cxx | 2 +- src/DlgRef/DlgRef_4Sel1List1Check_QTD.h | 2 +- src/DlgRef/DlgRef_4Sel1List_QTD.cxx | 2 +- src/DlgRef/DlgRef_4Sel1List_QTD.h | 2 +- src/DlgRef/DlgRef_6Sel_QTD.cxx | 2 +- src/DlgRef/DlgRef_6Sel_QTD.h | 2 +- src/DlgRef/DlgRef_Skeleton_QTD.cxx | 69 +- src/DlgRef/DlgRef_Skeleton_QTD.h | 30 +- src/DlgRef/DlgRef_SpinBox.cxx | 2 +- src/DlgRef/DlgRef_SpinBox.h | 2 +- src/DlgRef/Makefile.in | 8 +- src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui | 10 +- src/DlgRef/UIFiles/ui_to_cxx | 38 +- src/EntityGUI/EntityGUI.cxx | 476 +- src/EntityGUI/EntityGUI.h | 25 +- src/EntityGUI/EntityGUI_1Sel_QTD.cxx | 2 +- src/EntityGUI/EntityGUI_1Sel_QTD.h | 2 +- src/EntityGUI/EntityGUI_1Spin.cxx | 2 +- src/EntityGUI/EntityGUI_1Spin.h | 2 +- src/EntityGUI/EntityGUI_1Spin_QTD.cxx | 2 +- src/EntityGUI/EntityGUI_1Spin_QTD.h | 2 +- src/EntityGUI/EntityGUI_2Spin.cxx | 2 +- src/EntityGUI/EntityGUI_2Spin.h | 2 +- src/EntityGUI/EntityGUI_2Spin_QTD.cxx | 2 +- src/EntityGUI/EntityGUI_2Spin_QTD.h | 2 +- src/EntityGUI/EntityGUI_3Spin.cxx | 2 +- src/EntityGUI/EntityGUI_3Spin.h | 2 +- src/EntityGUI/EntityGUI_3Spin_QTD.cxx | 2 +- src/EntityGUI/EntityGUI_3Spin_QTD.h | 2 +- src/EntityGUI/EntityGUI_4Spin.cxx | 2 +- src/EntityGUI/EntityGUI_4Spin.h | 2 +- src/EntityGUI/EntityGUI_4Spin_QTD.cxx | 2 +- src/EntityGUI/EntityGUI_4Spin_QTD.h | 2 +- src/EntityGUI/EntityGUI_Dir1_QTD.cxx | 2 +- src/EntityGUI/EntityGUI_Dir1_QTD.h | 2 +- src/EntityGUI/EntityGUI_Dir2_QTD.cxx | 2 +- src/EntityGUI/EntityGUI_Dir2_QTD.h | 2 +- src/EntityGUI/EntityGUI_Point_QTD.cxx | 2 +- src/EntityGUI/EntityGUI_Point_QTD.h | 2 +- src/EntityGUI/EntityGUI_Skeleton_QTD.cxx | 85 +- src/EntityGUI/EntityGUI_Skeleton_QTD.h | 44 +- src/EntityGUI/EntityGUI_SketcherDlg.cxx | 37 +- src/EntityGUI/EntityGUI_SketcherDlg.h | 15 +- src/EntityGUI/EntityGUI_SubShapeDlg.cxx | 24 +- src/EntityGUI/EntityGUI_SubShapeDlg.h | 11 +- src/EntityGUI/Makefile.in | 6 +- .../UIFiles/EntityGUI_Skeleton_QTD.ui | 8 + src/EntityGUI/UIFiles/ui_to_cxx | 38 +- src/GEOM/GEOM_Application.cxx | 2 +- src/GEOM/GEOM_Application.hxx | 2 +- src/GEOM/GEOM_Application.ixx | 2 +- src/GEOM/GEOM_Application.jxx | 2 +- ...teratorOfDataMapOfAsciiStringTransient.hxx | 2 +- ...ratorOfDataMapOfAsciiStringTransient_0.cxx | 2 +- ...MapNodeOfDataMapOfAsciiStringTransient.hxx | 2 +- ...pNodeOfDataMapOfAsciiStringTransient_0.cxx | 2 +- .../GEOM_DataMapOfAsciiStringTransient.hxx | 2 +- .../GEOM_DataMapOfAsciiStringTransient_0.cxx | 2 +- src/GEOM/GEOM_Engine.cxx | 4 +- src/GEOM/GEOM_Engine.hxx | 2 +- src/GEOM/GEOM_Function.cxx | 2 +- src/GEOM/GEOM_Function.hxx | 2 +- src/GEOM/GEOM_Gen_i.cc | 2 +- src/GEOM/GEOM_IOperations.cxx | 2 +- src/GEOM/GEOM_IOperations.hxx | 2 +- src/GEOM/GEOM_ISubShape.hxx | 2 +- src/GEOM/GEOM_Object.cxx | 4 +- src/GEOM/GEOM_Object.hxx | 2 +- src/GEOM/GEOM_PythonDump.cxx | 51 +- src/GEOM/GEOM_PythonDump.hxx | 12 +- src/GEOM/GEOM_Solver.cxx | 2 +- src/GEOM/GEOM_Solver.hxx | 2 +- src/GEOM/GEOM_SubShapeDriver.cxx | 2 +- src/GEOM/GEOM_SubShapeDriver.hxx | 2 +- src/GEOM/Handle_GEOM_Application.hxx | 2 +- ...MapNodeOfDataMapOfAsciiStringTransient.hxx | 37 +- src/GEOM/Makefile.in | 25 +- src/GEOM/geom.cxx | 2 +- src/GEOMAlgo/BlockFix.cdl | 2 +- src/GEOMAlgo/BlockFix.cxx | 3 +- src/GEOMAlgo/BlockFix.hxx | 34 +- src/GEOMAlgo/BlockFix.ixx | 35 +- src/GEOMAlgo/BlockFix.jxx | 2 +- src/GEOMAlgo/BlockFix_BlockFixAPI.cdl | 2 +- src/GEOMAlgo/BlockFix_BlockFixAPI.cxx | 2 +- src/GEOMAlgo/BlockFix_BlockFixAPI.hxx | 35 +- src/GEOMAlgo/BlockFix_BlockFixAPI.ixx | 34 +- src/GEOMAlgo/BlockFix_BlockFixAPI.jxx | 2 +- src/GEOMAlgo/BlockFix_BlockFixAPI.lxx | 2 +- src/GEOMAlgo/BlockFix_CheckTool.cdl | 2 +- src/GEOMAlgo/BlockFix_CheckTool.cxx | 2 +- src/GEOMAlgo/BlockFix_CheckTool.hxx | 34 +- src/GEOMAlgo/BlockFix_CheckTool.ixx | 34 +- src/GEOMAlgo/BlockFix_CheckTool.jxx | 2 +- .../BlockFix_PeriodicSurfaceModifier.cdl | 2 +- .../BlockFix_PeriodicSurfaceModifier.cxx | 2 +- .../BlockFix_PeriodicSurfaceModifier.hxx | 35 +- .../BlockFix_PeriodicSurfaceModifier.ixx | 34 +- .../BlockFix_PeriodicSurfaceModifier.jxx | 2 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl | 2 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx | 2 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx | 35 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx | 34 +- src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx | 2 +- src/GEOMAlgo/BlockFix_UnionEdges.cdl | 2 +- src/GEOMAlgo/BlockFix_UnionEdges.cxx | 2 +- src/GEOMAlgo/BlockFix_UnionEdges.hxx | 34 +- src/GEOMAlgo/BlockFix_UnionEdges.ixx | 34 +- src/GEOMAlgo/BlockFix_UnionEdges.jxx | 2 +- src/GEOMAlgo/BlockFix_UnionFaces.cdl | 2 +- src/GEOMAlgo/BlockFix_UnionFaces.cxx | 2 +- src/GEOMAlgo/BlockFix_UnionFaces.hxx | 34 +- src/GEOMAlgo/BlockFix_UnionFaces.ixx | 34 +- src/GEOMAlgo/BlockFix_UnionFaces.jxx | 2 +- src/GEOMAlgo/GEOMAlgo.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_Algo.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_Algo.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Algo.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_Algo.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_Algo.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx | 2 +- ...taMapIteratorOfDataMapOfPassKeyInteger.hxx | 34 +- ...MapIteratorOfDataMapOfPassKeyInteger_0.cxx | 34 +- ...o_DataMapNodeOfDataMapOfPassKeyInteger.hxx | 35 +- ...DataMapNodeOfDataMapOfPassKeyInteger_0.cxx | 34 +- .../GEOMAlgo_DataMapOfPassKeyInteger.hxx | 34 +- .../GEOMAlgo_DataMapOfPassKeyInteger_0.cxx | 34 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx | 2 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Gluer.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_Gluer.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_Gluer.jxx | 2 +- ...aMapNodeOfIndexedDataMapOfIntegerShape.hxx | 35 +- ...apNodeOfIndexedDataMapOfIntegerShape_0.cxx | 34 +- ...deOfIndexedDataMapOfPassKeyListOfShape.hxx | 35 +- ...OfIndexedDataMapOfPassKeyListOfShape_0.cxx | 34 +- ...ndexedDataMapOfPassKeyShapeListOfShape.hxx | 35 +- ...exedDataMapOfPassKeyShapeListOfShape_0.cxx | 34 +- ...dDataMapNodeOfIndexedDataMapOfShapeBox.hxx | 35 +- ...ataMapNodeOfIndexedDataMapOfShapeBox_0.cxx | 34 +- ...ataMapNodeOfIndexedDataMapOfShapeState.hxx | 35 +- ...aMapNodeOfIndexedDataMapOfShapeState_0.cxx | 34 +- .../GEOMAlgo_IndexedDataMapOfIntegerShape.hxx | 34 +- ...EOMAlgo_IndexedDataMapOfIntegerShape_0.cxx | 34 +- ...lgo_IndexedDataMapOfPassKeyListOfShape.hxx | 34 +- ...o_IndexedDataMapOfPassKeyListOfShape_0.cxx | 34 +- ...ndexedDataMapOfPassKeyShapeListOfShape.hxx | 34 +- ...exedDataMapOfPassKeyShapeListOfShape_0.cxx | 34 +- .../GEOMAlgo_IndexedDataMapOfShapeBox.hxx | 34 +- .../GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx | 34 +- .../GEOMAlgo_IndexedDataMapOfShapeState.hxx | 34 +- .../GEOMAlgo_IndexedDataMapOfShapeState_0.cxx | 34 +- ...lgo_ListIteratorOfListOfCoupleOfShapes.hxx | 34 +- ...o_ListIteratorOfListOfCoupleOfShapes_0.cxx | 34 +- .../GEOMAlgo_ListIteratorOfListOfPnt.hxx | 34 +- .../GEOMAlgo_ListIteratorOfListOfPnt_0.cxx | 34 +- ...EOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx | 35 +- ...MAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx | 34 +- src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx | 35 +- .../GEOMAlgo_ListNodeOfListOfPnt_0.cxx | 34 +- .../GEOMAlgo_ListOfCoupleOfShapes.hxx | 34 +- .../GEOMAlgo_ListOfCoupleOfShapes_0.cxx | 34 +- src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx | 34 +- src/GEOMAlgo/GEOMAlgo_PassKey.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_PassKey.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKey.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_PassKey.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_PassKey.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_State.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_StateCollector.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_StateCollector.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_StateCollector.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_StateCollector.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_StateCollector.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_Tools.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_Tools.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_Tools.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_Tools.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_Tools.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx | 2 +- src/GEOMAlgo/GEOMAlgo_WireSolid.cdl | 2 +- src/GEOMAlgo/GEOMAlgo_WireSolid.cxx | 2 +- src/GEOMAlgo/GEOMAlgo_WireSolid.hxx | 34 +- src/GEOMAlgo/GEOMAlgo_WireSolid.ixx | 34 +- src/GEOMAlgo/GEOMAlgo_WireSolid.jxx | 2 +- src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx | 34 +- ...andle_BlockFix_PeriodicSurfaceModifier.hxx | 34 +- .../Handle_BlockFix_SphereSpaceModifier.hxx | 34 +- ...o_DataMapNodeOfDataMapOfPassKeyInteger.hxx | 34 +- ...aMapNodeOfIndexedDataMapOfIntegerShape.hxx | 34 +- ...deOfIndexedDataMapOfPassKeyListOfShape.hxx | 34 +- ...ndexedDataMapOfPassKeyShapeListOfShape.hxx | 34 +- ...dDataMapNodeOfIndexedDataMapOfShapeBox.hxx | 34 +- ...ataMapNodeOfIndexedDataMapOfShapeState.hxx | 34 +- ...EOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx | 34 +- .../Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx | 34 +- src/GEOMAlgo/Makefile.in | 8 +- src/GEOMBase/GEOMBase.cxx | 19 +- src/GEOMBase/GEOMBase.h | 65 +- src/GEOMBase/GEOMBase_Helper.cxx | 23 +- src/GEOMBase/GEOMBase_Helper.h | 2 +- src/GEOMBase/GEOMBase_Skeleton.cxx | 72 +- src/GEOMBase/GEOMBase_Skeleton.h | 35 +- src/GEOMBase/GEOMBase_aParameterDlg.cxx | 2 +- src/GEOMBase/GEOMBase_aParameterDlg.h | 2 +- src/GEOMBase/GEOM_Operation.cxx | 2 +- src/GEOMBase/GEOM_Operation.h | 2 +- src/GEOMBase/Makefile.in | 8 +- src/GEOMClient/GEOM_Client.cxx | 2 +- src/GEOMClient/GEOM_Client.hxx | 2 +- src/GEOMClient/Makefile.in | 8 +- src/GEOMContext/GEOMContext.cxx | 2 +- src/GEOMContext/GEOMContext.h | 2 +- src/GEOMContext/GEOM_icons.po | 19 + src/GEOMContext/GEOM_msg_en.po | 19 + src/GEOMContext/GEOM_msg_fr.po | 19 + src/GEOMContext/Makefile.in | 8 +- src/GEOMDS/GEOMDS_Commands.cxx | 2 +- src/GEOMDS/GEOMDS_Commands.jxx | 2 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.h | 2 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx | 2 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx | 2 +- src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx | 2 +- src/GEOMFiltersSelection/GEOM_FaceFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_FaceFilter.h | 2 +- src/GEOMFiltersSelection/GEOM_FaceFilter.hxx | 2 +- src/GEOMFiltersSelection/GEOM_FaceFilter.ixx | 2 +- src/GEOMFiltersSelection/GEOM_FaceFilter.jxx | 2 +- .../GEOM_LogicalFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_LogicalFilter.h | 2 +- .../GEOM_LogicalFilter.hxx | 2 +- src/GEOMFiltersSelection/GEOM_OCCFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_OCCFilter.h | 2 +- .../GEOM_PreviewFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_PreviewFilter.h | 2 +- .../GEOM_PreviewFilter.hxx | 2 +- .../GEOM_PreviewFilter.ixx | 2 +- .../GEOM_PreviewFilter.jxx | 2 +- .../GEOM_SelectionFilter.cxx | 2 +- .../GEOM_SelectionFilter.h | 2 +- .../GEOM_ShapeTypeFilter.cxx | 2 +- .../GEOM_ShapeTypeFilter.hxx | 2 +- .../GEOM_ShapeTypeFilter.ixx | 2 +- .../GEOM_ShapeTypeFilter.jxx | 2 +- src/GEOMFiltersSelection/GEOM_TypeFilter.cxx | 2 +- src/GEOMFiltersSelection/GEOM_TypeFilter.h | 2 +- src/GEOMFiltersSelection/GEOM_TypeFilter.hxx | 2 +- .../Handle_GEOM_EdgeFilter.hxx | 2 +- .../Handle_GEOM_FaceFilter.hxx | 2 +- .../Handle_GEOM_PreviewFilter.hxx | 2 +- .../Handle_GEOM_ShapeTypeFilter.hxx | 2 +- src/GEOMFiltersSelection/Makefile.in | 8 +- src/GEOMGUI/GEOMGUI.cxx | 2 +- src/GEOMGUI/GEOMGUI.h | 2 +- src/GEOMGUI/GEOMGUI_OCCSelector.cxx | 2 +- src/GEOMGUI/GEOMGUI_OCCSelector.h | 2 +- src/GEOMGUI/GEOMGUI_Selection.cxx | 2 +- src/GEOMGUI/GEOMGUI_Selection.h | 2 +- src/GEOMGUI/GEOM_Displayer.cxx | 2 +- src/GEOMGUI/GEOM_Displayer.h | 2 +- src/GEOMGUI/GEOM_images.po | 19 + src/GEOMGUI/GEOM_msg_en.po | 29 +- src/GEOMGUI/GEOM_msg_fr.po | 19 + src/GEOMGUI/GeometryGUI.cxx | 106 +- src/GEOMGUI/GeometryGUI.h | 15 +- src/GEOMGUI/GeometryGUI_Swig.cxx | 461 +- src/GEOMGUI/GeometryGUI_Swig.hxx | 5 +- src/GEOMGUI/GeometryGUI_Swig.i | 5 +- src/GEOMGUI/Makefile.in | 11 +- src/GEOMImpl/GEOMImpl_ArcDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ArcDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_Block6Explorer.cxx | 95 +- src/GEOMImpl/GEOMImpl_Block6Explorer.hxx | 2 +- src/GEOMImpl/GEOMImpl_BlockDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_BlockDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_BooleanDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_BooleanDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_BoxDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_BoxDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ChamferDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ChamferDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_CircleDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_CircleDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ConeDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ConeDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_CopyDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_CopyDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_CylinderDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_CylinderDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_EllipseDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_EllipseDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ExportDriver.cxx | 15 +- src/GEOMImpl/GEOMImpl_ExportDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_FilletDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_FilletDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_FillingDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_FillingDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_Gen.cxx | 4 +- src/GEOMImpl/GEOMImpl_Gen.hxx | 2 +- src/GEOMImpl/GEOMImpl_GlueDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_GlueDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_HealingDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_HealingDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx | 244 +- src/GEOMImpl/GEOMImpl_I3DPrimOperations.hxx | 14 +- src/GEOMImpl/GEOMImpl_IArc.hxx | 2 +- src/GEOMImpl/GEOMImpl_IArchimede.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBasicOperations.cxx | 109 +- src/GEOMImpl/GEOMImpl_IBasicOperations.hxx | 11 +- src/GEOMImpl/GEOMImpl_IBlockTrsf.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBlocks.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.cxx | 19 +- src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBoolean.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IBox.hxx | 2 +- src/GEOMImpl/GEOMImpl_IChamfer.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICircle.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICone.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICopy.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_ICylinder.hxx | 2 +- src/GEOMImpl/GEOMImpl_IEllipse.hxx | 2 +- src/GEOMImpl/GEOMImpl_IFillet.hxx | 2 +- src/GEOMImpl/GEOMImpl_IFilling.hxx | 2 +- src/GEOMImpl/GEOMImpl_IGlue.hxx | 2 +- src/GEOMImpl/GEOMImpl_IGroupOperations.cxx | 93 +- src/GEOMImpl/GEOMImpl_IGroupOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IHealing.hxx | 2 +- src/GEOMImpl/GEOMImpl_IHealingOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_IHealingOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IImportExport.hxx | 15 +- src/GEOMImpl/GEOMImpl_IInsertOperations.cxx | 50 +- src/GEOMImpl/GEOMImpl_IInsertOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_ILine.hxx | 2 +- src/GEOMImpl/GEOMImpl_ILocalOperations.cxx | 25 +- src/GEOMImpl/GEOMImpl_ILocalOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IMarker.hxx | 2 +- src/GEOMImpl/GEOMImpl_IMeasure.hxx | 2 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx | 2 +- src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_IMirror.hxx | 2 +- src/GEOMImpl/GEOMImpl_IOffset.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPartition.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPipe.hxx | 8 +- src/GEOMImpl/GEOMImpl_IPlane.hxx | 12 +- src/GEOMImpl/GEOMImpl_IPoint.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPolyline.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPosition.hxx | 2 +- src/GEOMImpl/GEOMImpl_IPrism.hxx | 2 +- src/GEOMImpl/GEOMImpl_IRevolution.hxx | 2 +- src/GEOMImpl/GEOMImpl_IRotate.hxx | 2 +- src/GEOMImpl/GEOMImpl_IScale.hxx | 2 +- src/GEOMImpl/GEOMImpl_IShapes.hxx | 2 +- src/GEOMImpl/GEOMImpl_IShapesOperations.cxx | 311 +- src/GEOMImpl/GEOMImpl_IShapesOperations.hxx | 12 +- src/GEOMImpl/GEOMImpl_ISketcher.hxx | 2 +- src/GEOMImpl/GEOMImpl_ISphere.hxx | 2 +- src/GEOMImpl/GEOMImpl_ISpline.hxx | 2 +- src/GEOMImpl/GEOMImpl_ITorus.hxx | 2 +- .../GEOMImpl_ITransformOperations.cxx | 2 +- .../GEOMImpl_ITransformOperations.hxx | 2 +- src/GEOMImpl/GEOMImpl_ITranslate.hxx | 2 +- src/GEOMImpl/GEOMImpl_IVector.hxx | 14 +- src/GEOMImpl/GEOMImpl_ImportDriver.cxx | 15 +- src/GEOMImpl/GEOMImpl_ImportDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_LineDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_LineDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_MarkerDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_MarkerDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_MeasureDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_MeasureDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_MirrorDriver.cxx | 20 +- src/GEOMImpl/GEOMImpl_MirrorDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_OffsetDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_OffsetDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PartitionDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_PartitionDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PipeDriver.cxx | 204 +- src/GEOMImpl/GEOMImpl_PipeDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PlaneDriver.cxx | 46 +- src/GEOMImpl/GEOMImpl_PlaneDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PointDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_PointDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PolylineDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_PolylineDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PositionDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_PositionDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_PrismDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_PrismDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_RotateDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_RotateDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ScaleDriver.cxx | 26 +- src/GEOMImpl/GEOMImpl_ScaleDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_ShapeDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_ShapeDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_SketcherDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_SketcherDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_SphereDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_SphereDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_SplineDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_SplineDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_Template.cxx | 2 +- src/GEOMImpl/GEOMImpl_Template.hxx | 2 +- src/GEOMImpl/GEOMImpl_TorusDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_TorusDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_TranslateDriver.cxx | 2 +- src/GEOMImpl/GEOMImpl_TranslateDriver.hxx | 2 +- src/GEOMImpl/GEOMImpl_Types.hxx | 11 +- src/GEOMImpl/GEOMImpl_VectorDriver.cxx | 33 +- src/GEOMImpl/GEOMImpl_VectorDriver.hxx | 2 +- src/GEOMImpl/GUID.txt | 1 + src/GEOMImpl/Makefile.in | 27 +- src/GEOMToolsGUI/GEOMToolsGUI.cxx | 2 +- src/GEOMToolsGUI/GEOMToolsGUI.h | 2 +- src/GEOMToolsGUI/GEOMToolsGUI_1.cxx | 9 +- src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx | 135 - src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx | 36 +- src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h | 6 +- .../GEOMToolsGUI_TransparencyDlg.cxx | 38 +- .../GEOMToolsGUI_TransparencyDlg.h | 4 +- src/GEOMToolsGUI/Makefile.in | 16 +- src/GEOM_I/GEOM_DumpPython.cc | 4 +- src/GEOM_I/GEOM_Gen_i.cc | 4 +- src/GEOM_I/GEOM_Gen_i.hh | 2 +- src/GEOM_I/GEOM_I3DPrimOperations_i.cc | 100 +- src/GEOM_I/GEOM_I3DPrimOperations_i.hh | 13 +- src/GEOM_I/GEOM_IBasicOperations_i.cc | 69 +- src/GEOM_I/GEOM_IBasicOperations_i.hh | 10 +- src/GEOM_I/GEOM_IBlocksOperations_i.cc | 2 +- src/GEOM_I/GEOM_IBlocksOperations_i.hh | 2 +- src/GEOM_I/GEOM_IBooleanOperations_i.cc | 2 +- src/GEOM_I/GEOM_IBooleanOperations_i.hh | 2 +- src/GEOM_I/GEOM_ICurvesOperations_i.cc | 2 +- src/GEOM_I/GEOM_ICurvesOperations_i.hh | 2 +- src/GEOM_I/GEOM_IGroupOperations_i.cc | 2 +- src/GEOM_I/GEOM_IGroupOperations_i.hh | 2 +- src/GEOM_I/GEOM_IHealingOperations_i.cc | 2 +- src/GEOM_I/GEOM_IHealingOperations_i.hh | 2 +- src/GEOM_I/GEOM_IInsertOperations_i.cc | 2 +- src/GEOM_I/GEOM_IInsertOperations_i.hh | 2 +- src/GEOM_I/GEOM_ILocalOperations_i.cc | 2 +- src/GEOM_I/GEOM_ILocalOperations_i.hh | 2 +- src/GEOM_I/GEOM_IMeasureOperations_i.cc | 4 +- src/GEOM_I/GEOM_IMeasureOperations_i.hh | 2 +- src/GEOM_I/GEOM_IOperations_i.cc | 2 +- src/GEOM_I/GEOM_IOperations_i.hh | 2 +- src/GEOM_I/GEOM_IShapesOperations_i.cc | 72 +- src/GEOM_I/GEOM_IShapesOperations_i.hh | 10 +- src/GEOM_I/GEOM_ITransformOperations_i.cc | 2 +- src/GEOM_I/GEOM_ITransformOperations_i.hh | 2 +- src/GEOM_I/GEOM_Object_i.cc | 6 +- src/GEOM_I/GEOM_Object_i.hh | 4 +- src/GEOM_I/Makefile.in | 8 +- src/GEOM_I_Superv/GEOM_List_i.hh | 2 +- src/GEOM_I_Superv/GEOM_Superv_i.cc | 382 +- src/GEOM_I_Superv/GEOM_Superv_i.hh | 37 +- src/GEOM_I_Superv/Makefile.in | 10 +- src/GEOM_SWIG/GEOM_Nut.py | 155 +- src/GEOM_SWIG/GEOM_Partition1.py | 19 +- src/GEOM_SWIG/GEOM_Partition2.py | 19 +- src/GEOM_SWIG/GEOM_Partition3.py | 19 +- src/GEOM_SWIG/GEOM_Partition4.py | 19 +- src/GEOM_SWIG/GEOM_Partition5.py | 19 +- src/GEOM_SWIG/GEOM_Sketcher.py | 116 +- src/GEOM_SWIG/GEOM_Spanner.py | 2 +- src/GEOM_SWIG/GEOM_TestAll.py | 2 +- src/GEOM_SWIG/GEOM_TestHealing.py | 2 +- src/GEOM_SWIG/GEOM_TestMeasures.py | 19 + src/GEOM_SWIG/GEOM_TestOthers.py | 55 +- src/GEOM_SWIG/GEOM_blocks.py | 2 +- src/GEOM_SWIG/GEOM_cyl2complementary.py | 24 +- src/GEOM_SWIG/GEOM_example.py | 2 +- src/GEOM_SWIG/GEOM_example2.py | 2 +- src/GEOM_SWIG/GEOM_example3.py | 40 +- src/GEOM_SWIG/GEOM_example4.py | 4 +- src/GEOM_SWIG/GEOM_example5.py | 108 +- src/GEOM_SWIG/GEOM_moteur.py | 2 +- src/GEOM_SWIG/GEOM_shared_modules.py | 19 + src/GEOM_SWIG/GEOM_shellSolid.py | 19 + src/GEOM_SWIG/GEOM_tube_geom.py | 19 + src/GEOM_SWIG/GEOM_tube_geom_gg2.py | 336 +- src/GEOM_SWIG/GEOM_usinggeom.py | 2 +- src/GEOM_SWIG/Makefile.in | 2 +- src/GEOM_SWIG/PAL_MESH_019_020_geometry.py | 19 + src/GEOM_SWIG/PAL_MESH_028_geometry.py | 19 + src/GEOM_SWIG/PAL_MESH_030_geometry.py | 19 + src/GEOM_SWIG/PAL_MESH_033_geometry.py | 19 + src/GEOM_SWIG/PAL_MESH_035_geometry.py | 19 + src/GEOM_SWIG/batchmode_geompy.py | 2 +- src/GEOM_SWIG/geompy.py | 2541 +++-- src/GEOM_SWIG/libGEOM_Swig.i | 2 +- src/GenerationGUI/GenerationGUI.cxx | 4 +- src/GenerationGUI/GenerationGUI.h | 2 +- .../GenerationGUI_FillingDlg.cxx | 19 +- src/GenerationGUI/GenerationGUI_FillingDlg.h | 9 +- src/GenerationGUI/GenerationGUI_PipeDlg.cxx | 10 +- src/GenerationGUI/GenerationGUI_PipeDlg.h | 9 +- src/GenerationGUI/GenerationGUI_PrismDlg.cxx | 58 +- src/GenerationGUI/GenerationGUI_PrismDlg.h | 8 +- src/GenerationGUI/GenerationGUI_RevolDlg.cxx | 16 +- src/GenerationGUI/GenerationGUI_RevolDlg.h | 9 +- src/GenerationGUI/Makefile.in | 6 +- src/GroupGUI/GroupGUI.cxx | 45 +- src/GroupGUI/GroupGUI.h | 2 +- src/GroupGUI/GroupGUI_GroupDlg.cxx | 27 +- src/GroupGUI/GroupGUI_GroupDlg.h | 8 +- src/GroupGUI/Makefile.in | 6 +- src/IGESExport/IGESExport.cxx | 47 +- src/IGESExport/Makefile.in | 8 +- src/IGESImport/IGESImport.cxx | 3 +- src/IGESImport/Makefile.in | 8 +- src/Makefile.in | 2 +- src/MeasureGUI/Makefile.in | 6 +- src/MeasureGUI/MeasureGUI.cxx | 51 +- src/MeasureGUI/MeasureGUI.h | 2 +- .../MeasureGUI_1Sel12LineEdit_QTD.cxx | 2 +- .../MeasureGUI_1Sel12LineEdit_QTD.h | 2 +- .../MeasureGUI_1Sel1TextView_QTD.cxx | 2 +- src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h | 2 +- .../MeasureGUI_1Sel3LineEdit_QTD.cxx | 2 +- src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h | 2 +- .../MeasureGUI_1Sel6LineEdit_QTD.cxx | 2 +- src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h | 2 +- .../MeasureGUI_2Sel1LineEdit_QTD.cxx | 2 +- src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h | 2 +- src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx | 23 +- src/MeasureGUI/MeasureGUI_BndBoxDlg.h | 27 +- src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx | 17 +- src/MeasureGUI/MeasureGUI_CenterMassDlg.h | 12 +- .../MeasureGUI_CheckCompoundOfBlocksDlg.cxx | 194 +- .../MeasureGUI_CheckCompoundOfBlocksDlg.h | 46 +- src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx | 4 +- src/MeasureGUI/MeasureGUI_CheckShapeDlg.h | 2 +- src/MeasureGUI/MeasureGUI_DistanceDlg.cxx | 4 +- src/MeasureGUI/MeasureGUI_DistanceDlg.h | 2 +- src/MeasureGUI/MeasureGUI_InertiaDlg.cxx | 4 +- src/MeasureGUI/MeasureGUI_InertiaDlg.h | 2 +- src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx | 4 +- src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h | 2 +- src/MeasureGUI/MeasureGUI_PointDlg.cxx | 4 +- src/MeasureGUI/MeasureGUI_PointDlg.h | 2 +- src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx | 4 +- src/MeasureGUI/MeasureGUI_PropertiesDlg.h | 2 +- src/MeasureGUI/MeasureGUI_Skeleton.cxx | 27 +- src/MeasureGUI/MeasureGUI_Skeleton.h | 5 +- src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx | 72 +- src/MeasureGUI/MeasureGUI_Skeleton_QTD.h | 42 +- src/MeasureGUI/MeasureGUI_WhatisDlg.cxx | 4 +- src/MeasureGUI/MeasureGUI_WhatisDlg.h | 2 +- .../UIFiles/MeasureGUI_Skeleton_QTD.ui | 29 +- src/MeasureGUI/UIFiles/ui_to_cxx | 38 +- src/NMTAlgo/Makefile.in | 8 +- src/NMTAlgo/NMTAlgo.cdl | 2 +- src/NMTAlgo/NMTAlgo_Algo.cdl | 2 +- src/NMTAlgo/NMTAlgo_Algo.cxx | 2 +- src/NMTAlgo/NMTAlgo_Algo.hxx | 31 +- src/NMTAlgo/NMTAlgo_Algo.ixx | 35 +- src/NMTAlgo/NMTAlgo_Algo.jxx | 2 +- src/NMTAlgo/NMTAlgo_Builder.cdl | 2 +- src/NMTAlgo/NMTAlgo_Builder.cxx | 2 +- src/NMTAlgo/NMTAlgo_Builder.hxx | 31 +- src/NMTAlgo/NMTAlgo_Builder.ixx | 31 +- src/NMTAlgo/NMTAlgo_Builder.jxx | 2 +- src/NMTAlgo/NMTAlgo_Loop3d.cdl | 2 +- src/NMTAlgo/NMTAlgo_Loop3d.cxx | 2 +- src/NMTAlgo/NMTAlgo_Loop3d.hxx | 31 +- src/NMTAlgo/NMTAlgo_Loop3d.ixx | 31 +- src/NMTAlgo/NMTAlgo_Loop3d.jxx | 2 +- src/NMTAlgo/NMTAlgo_Splitter.cdl | 2 +- src/NMTAlgo/NMTAlgo_Splitter.cxx | 2 +- src/NMTAlgo/NMTAlgo_Splitter.hxx | 34 +- src/NMTAlgo/NMTAlgo_Splitter.ixx | 31 +- src/NMTAlgo/NMTAlgo_Splitter.jxx | 2 +- src/NMTAlgo/NMTAlgo_Splitter1.cdl | 2 +- src/NMTAlgo/NMTAlgo_Splitter1.cxx | 2 +- src/NMTAlgo/NMTAlgo_Splitter1.hxx | 31 +- src/NMTAlgo/NMTAlgo_Splitter1.ixx | 31 +- src/NMTAlgo/NMTAlgo_Splitter1.jxx | 2 +- src/NMTAlgo/NMTAlgo_Splitter_1.cxx | 2 +- src/NMTAlgo/NMTAlgo_Splitter_2.cxx | 2 +- src/NMTAlgo/NMTAlgo_Tools.cdl | 2 +- src/NMTAlgo/NMTAlgo_Tools.cxx | 2 +- src/NMTAlgo/NMTAlgo_Tools.hxx | 31 +- src/NMTAlgo/NMTAlgo_Tools.ixx | 31 +- src/NMTAlgo/NMTAlgo_Tools.jxx | 2 +- ...pOfIntegerIndexedDataMapOfShapeInteger.hxx | 30 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 30 +- src/NMTDS/Makefile.in | 8 +- src/NMTDS/NMTDS.cdl | 2 +- src/NMTDS/NMTDS_CArray1OfIndexRange.hxx | 31 +- src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx | 31 +- src/NMTDS/NMTDS_IndexRange.cdl | 2 +- src/NMTDS/NMTDS_IndexRange.cxx | 2 +- src/NMTDS/NMTDS_IndexRange.hxx | 31 +- src/NMTDS/NMTDS_IndexRange.ixx | 31 +- src/NMTDS/NMTDS_IndexRange.jxx | 2 +- ...pOfIntegerIndexedDataMapOfShapeInteger.hxx | 30 +- ...fIntegerIndexedDataMapOfShapeInteger_0.cxx | 31 +- ...pOfIntegerIndexedDataMapOfShapeInteger.hxx | 31 +- ...fIntegerIndexedDataMapOfShapeInteger_0.cxx | 31 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 31 +- ...xedDataMapOfShapeAncestorsSuccessors_0.cxx | 31 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 30 +- ...xedDataMapOfShapeAncestorsSuccessors_0.cxx | 31 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 31 +- ...xedDataMapOfShapeAncestorsSuccessors_0.cxx | 31 +- src/NMTDS/NMTDS_PShapesDataStructure.hxx | 31 +- src/NMTDS/NMTDS_ShapesDataStructure.cdl | 2 +- src/NMTDS/NMTDS_ShapesDataStructure.cxx | 2 +- src/NMTDS/NMTDS_ShapesDataStructure.hxx | 34 +- src/NMTDS/NMTDS_ShapesDataStructure.ixx | 31 +- src/NMTDS/NMTDS_ShapesDataStructure.jxx | 2 +- ...pOfIntegerIndexedDataMapOfShapeInteger.hxx | 30 +- ...dexedDataMapOfShapeAncestorsSuccessors.hxx | 30 +- ...eOfIndexedDataMapOfIndexedMapOfInteger.hxx | 30 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 30 +- ...apNodeOfIndexedDataMapOfShapePaveBlock.hxx | 30 +- ...e_NMTTools_ListNodeOfListOfCommonBlock.hxx | 30 +- ...NMTTools_ListNodeOfListOfCoupleOfShape.hxx | 30 +- src/NMTTools/Makefile.in | 8 +- src/NMTTools/NMTTools.cdl | 2 +- src/NMTTools/NMTTools_CommonBlock.cdl | 2 +- src/NMTTools/NMTTools_CommonBlock.cxx | 2 +- src/NMTTools/NMTTools_CommonBlock.hxx | 31 +- src/NMTTools/NMTTools_CommonBlock.ixx | 31 +- src/NMTTools/NMTTools_CommonBlock.jxx | 2 +- src/NMTTools/NMTTools_CommonBlockAPI.cdl | 2 +- src/NMTTools/NMTTools_CommonBlockAPI.cxx | 2 +- src/NMTTools/NMTTools_CommonBlockAPI.hxx | 31 +- src/NMTTools/NMTTools_CommonBlockAPI.ixx | 31 +- src/NMTTools/NMTTools_CommonBlockAPI.jxx | 2 +- src/NMTTools/NMTTools_CommonBlockPool.hxx | 31 +- src/NMTTools/NMTTools_CommonBlockPool_0.cxx | 31 +- src/NMTTools/NMTTools_CoupleOfShape.cdl | 2 +- src/NMTTools/NMTTools_CoupleOfShape.cxx | 2 +- src/NMTTools/NMTTools_CoupleOfShape.hxx | 31 +- src/NMTTools/NMTTools_CoupleOfShape.ixx | 31 +- src/NMTTools/NMTTools_CoupleOfShape.jxx | 2 +- src/NMTTools/NMTTools_DEProcessor.cdl | 2 +- src/NMTTools/NMTTools_DEProcessor.cxx | 2 +- src/NMTTools/NMTTools_DEProcessor.hxx | 31 +- src/NMTTools/NMTTools_DEProcessor.ixx | 31 +- src/NMTTools/NMTTools_DEProcessor.jxx | 2 +- src/NMTTools/NMTTools_DSFiller.cdl | 2 +- src/NMTTools/NMTTools_DSFiller.cxx | 2 +- src/NMTTools/NMTTools_DSFiller.hxx | 31 +- src/NMTTools/NMTTools_DSFiller.ixx | 31 +- src/NMTTools/NMTTools_DSFiller.jxx | 2 +- ...eOfIndexedDataMapOfIndexedMapOfInteger.hxx | 30 +- ...fIndexedDataMapOfIndexedMapOfInteger_0.cxx | 31 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 30 +- ...dexedDataMapOfShapeIndexedMapOfShape_0.cxx | 31 +- ...apNodeOfIndexedDataMapOfShapePaveBlock.hxx | 30 +- ...NodeOfIndexedDataMapOfShapePaveBlock_0.cxx | 31 +- ...ls_IndexedDataMapOfIndexedMapOfInteger.hxx | 31 +- ..._IndexedDataMapOfIndexedMapOfInteger_0.cxx | 31 +- ...IndexedDataMapOfShapeIndexedMapOfShape.hxx | 31 +- ...dexedDataMapOfShapeIndexedMapOfShape_0.cxx | 31 +- ...MTTools_IndexedDataMapOfShapePaveBlock.hxx | 31 +- ...Tools_IndexedDataMapOfShapePaveBlock_0.cxx | 31 +- .../NMTTools_IteratorOfCoupleOfShape.cdl | 2 +- .../NMTTools_IteratorOfCoupleOfShape.cxx | 2 +- .../NMTTools_IteratorOfCoupleOfShape.hxx | 31 +- .../NMTTools_IteratorOfCoupleOfShape.ixx | 31 +- .../NMTTools_IteratorOfCoupleOfShape.jxx | 2 +- ...TTools_ListIteratorOfListOfCommonBlock.hxx | 31 +- ...ools_ListIteratorOfListOfCommonBlock_0.cxx | 31 +- ...ools_ListIteratorOfListOfCoupleOfShape.hxx | 31 +- ...ls_ListIteratorOfListOfCoupleOfShape_0.cxx | 31 +- .../NMTTools_ListNodeOfListOfCommonBlock.hxx | 30 +- ...NMTTools_ListNodeOfListOfCommonBlock_0.cxx | 31 +- ...NMTTools_ListNodeOfListOfCoupleOfShape.hxx | 30 +- ...TTools_ListNodeOfListOfCoupleOfShape_0.cxx | 31 +- src/NMTTools/NMTTools_ListOfCommonBlock.hxx | 31 +- src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx | 31 +- src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx | 31 +- .../NMTTools_ListOfCoupleOfShape_0.cxx | 31 +- src/NMTTools/NMTTools_PCurveMaker.cdl | 2 +- src/NMTTools/NMTTools_PCurveMaker.cxx | 2 +- src/NMTTools/NMTTools_PCurveMaker.hxx | 31 +- src/NMTTools/NMTTools_PCurveMaker.ixx | 31 +- src/NMTTools/NMTTools_PCurveMaker.jxx | 2 +- src/NMTTools/NMTTools_PDSFiller.hxx | 31 +- src/NMTTools/NMTTools_PPaveFiller.hxx | 31 +- src/NMTTools/NMTTools_PaveFiller.cdl | 2 +- src/NMTTools/NMTTools_PaveFiller.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller.hxx | 34 +- src/NMTTools/NMTTools_PaveFiller.ixx | 31 +- src/NMTTools/NMTTools_PaveFiller.jxx | 2 +- src/NMTTools/NMTTools_PaveFiller_0.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_1.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_2.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_3.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_4.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_5.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_6.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_7.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_8.cxx | 2 +- src/NMTTools/NMTTools_PaveFiller_9.cxx | 2 +- src/NMTTools/NMTTools_Tools.cdl | 2 +- src/NMTTools/NMTTools_Tools.cxx | 2 +- src/NMTTools/NMTTools_Tools.hxx | 31 +- src/NMTTools/NMTTools_Tools.ixx | 31 +- src/NMTTools/NMTTools_Tools.jxx | 2 +- src/OBJECT/GEOM_AISShape.cxx | 6 +- src/OBJECT/GEOM_AISShape.hxx | 2 +- src/OBJECT/GEOM_AISShape.ixx | 2 +- src/OBJECT/GEOM_AISShape.jxx | 4 +- src/OBJECT/GEOM_AISTrihedron.cxx | 142 +- src/OBJECT/GEOM_AISTrihedron.hxx | 162 +- src/OBJECT/GEOM_Actor.cxx | 18 +- src/OBJECT/GEOM_Actor.h | 10 +- src/OBJECT/GEOM_AssemblyBuilder.cxx | 2 +- src/OBJECT/GEOM_AssemblyBuilder.h | 2 +- src/OBJECT/GEOM_InteractiveObject.cxx | 2 +- src/OBJECT/GEOM_InteractiveObject.hxx | 2 +- src/OBJECT/GEOM_InteractiveObject.ixx | 2 +- src/OBJECT/GEOM_InteractiveObject.jxx | 2 +- src/OBJECT/GEOM_OCCReader.cxx | 2 +- src/OBJECT/GEOM_OCCReader.h | 2 +- src/OBJECT/GEOM_VTKTrihedron.cxx | 30 +- src/OBJECT/GEOM_VTKTrihedron.hxx | 14 +- src/OBJECT/Handle_GEOM_AISShape.hxx | 2 +- src/OBJECT/Handle_GEOM_InteractiveObject.hxx | 2 +- src/OBJECT/Makefile.in | 8 +- src/OperationGUI/Makefile.in | 6 +- src/OperationGUI/OperationGUI.cxx | 34 +- src/OperationGUI/OperationGUI.h | 2 +- .../OperationGUI_ArchimedeDlg.cxx | 24 +- src/OperationGUI/OperationGUI_ArchimedeDlg.h | 8 +- src/OperationGUI/OperationGUI_ChamferDlg.cxx | 44 +- src/OperationGUI/OperationGUI_ChamferDlg.h | 14 +- src/OperationGUI/OperationGUI_ClippingDlg.cxx | 79 +- src/OperationGUI/OperationGUI_ClippingDlg.h | 17 +- src/OperationGUI/OperationGUI_FilletDlg.cxx | 104 +- src/OperationGUI/OperationGUI_FilletDlg.h | 18 +- src/OperationGUI/OperationGUI_MaterialDlg.cxx | 55 +- src/OperationGUI/OperationGUI_MaterialDlg.h | 12 +- .../OperationGUI_PartitionDlg.cxx | 151 +- src/OperationGUI/OperationGUI_PartitionDlg.h | 22 +- src/PARTITION/Makefile.in | 8 +- src/PARTITION/Partition.cdl | 4 +- src/PARTITION/Partition_Inter2d.cdl | 4 +- src/PARTITION/Partition_Inter2d.cxx | 2 +- src/PARTITION/Partition_Inter2d.hxx | 2 +- src/PARTITION/Partition_Inter2d.ixx | 2 +- src/PARTITION/Partition_Inter2d.jxx | 2 +- src/PARTITION/Partition_Inter3d.cdl | 4 +- src/PARTITION/Partition_Inter3d.cxx | 2 +- src/PARTITION/Partition_Inter3d.hxx | 2 +- src/PARTITION/Partition_Inter3d.ixx | 2 +- src/PARTITION/Partition_Inter3d.jxx | 2 +- src/PARTITION/Partition_Loop.cdl | 4 +- src/PARTITION/Partition_Loop.cxx | 2 +- src/PARTITION/Partition_Loop.hxx | 2 +- src/PARTITION/Partition_Loop.ixx | 2 +- src/PARTITION/Partition_Loop.jxx | 2 +- src/PARTITION/Partition_Loop2d.cdl | 2 +- src/PARTITION/Partition_Loop2d.cxx | 19 +- src/PARTITION/Partition_Loop2d.hxx | 19 +- src/PARTITION/Partition_Loop2d.ixx | 22 +- src/PARTITION/Partition_Loop2d.jxx | 22 +- src/PARTITION/Partition_Loop3d.cdl | 2 +- src/PARTITION/Partition_Loop3d.cxx | 19 +- src/PARTITION/Partition_Loop3d.hxx | 19 +- src/PARTITION/Partition_Loop3d.ixx | 22 +- src/PARTITION/Partition_Loop3d.jxx | 22 +- src/PARTITION/Partition_Spliter.cdl | 4 +- src/PARTITION/Partition_Spliter.cxx | 2 +- src/PARTITION/Partition_Spliter.hxx | 19 +- src/PARTITION/Partition_Spliter.ixx | 2 +- src/PARTITION/Partition_Spliter.jxx | 2 +- src/PrimitiveGUI/Makefile.in | 6 +- src/PrimitiveGUI/PrimitiveGUI.cxx | 2 +- src/PrimitiveGUI/PrimitiveGUI.h | 2 +- src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx | 37 +- src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h | 13 +- src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx | 22 +- src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h | 9 +- src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx | 18 +- src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h | 8 +- src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx | 16 +- src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h | 10 +- src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx | 21 +- src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h | 15 +- src/RepairGUI/Makefile.in | 6 +- src/RepairGUI/RepairGUI.cxx | 46 +- src/RepairGUI/RepairGUI.h | 2 +- src/RepairGUI/RepairGUI_CloseContourDlg.cxx | 47 +- src/RepairGUI/RepairGUI_CloseContourDlg.h | 10 +- src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx | 36 +- src/RepairGUI/RepairGUI_DivideEdgeDlg.h | 7 +- src/RepairGUI/RepairGUI_FreeBoundDlg.cxx | 42 +- src/RepairGUI/RepairGUI_FreeBoundDlg.h | 22 +- src/RepairGUI/RepairGUI_FreeFacesDlg.cxx | 40 +- src/RepairGUI/RepairGUI_FreeFacesDlg.h | 28 +- src/RepairGUI/RepairGUI_GlueDlg.cxx | 42 +- src/RepairGUI/RepairGUI_GlueDlg.h | 10 +- src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx | 37 +- src/RepairGUI/RepairGUI_RemoveHolesDlg.h | 14 +- src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx | 58 +- src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h | 14 +- src/RepairGUI/RepairGUI_SewingDlg.cxx | 37 +- src/RepairGUI/RepairGUI_SewingDlg.h | 14 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx | 46 +- src/RepairGUI/RepairGUI_ShapeProcessDlg.h | 47 +- src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx | 41 +- src/RepairGUI/RepairGUI_SuppressFacesDlg.h | 28 +- src/SKETCHER/Makefile.in | 8 +- src/SKETCHER/Sketcher_Profile.cxx | 2 +- src/SKETCHER/Sketcher_Profile.hxx | 2 +- src/STEPExport/Makefile.in | 8 +- src/STEPExport/STEPExport.cxx | 2 +- src/STEPImport/Makefile.in | 8 +- src/STEPImport/STEPImport.cxx | 3 +- src/ShHealOper/Makefile.in | 6 +- src/ShHealOper/ShHealOper_CloseContour.cxx | 23 +- src/ShHealOper/ShHealOper_CloseContour.hxx | 36 +- src/ShHealOper/ShHealOper_EdgeDivide.cxx | 36 +- src/ShHealOper/ShHealOper_EdgeDivide.hxx | 36 +- src/ShHealOper/ShHealOper_FillHoles.cxx | 36 +- src/ShHealOper/ShHealOper_FillHoles.hxx | 37 +- src/ShHealOper/ShHealOper_RemoveFace.cxx | 36 +- src/ShHealOper/ShHealOper_RemoveFace.hxx | 37 +- .../ShHealOper_RemoveInternalWires.cxx | 36 +- .../ShHealOper_RemoveInternalWires.hxx | 36 +- src/ShHealOper/ShHealOper_Sewing.cxx | 36 +- src/ShHealOper/ShHealOper_Sewing.hxx | 36 +- src/ShHealOper/ShHealOper_ShapeProcess.cxx | 36 +- src/ShHealOper/ShHealOper_ShapeProcess.hxx | 36 +- src/ShHealOper/ShHealOper_SpiltCurve2d.hxx | 36 +- src/ShHealOper/ShHealOper_SplitCurve2d.cxx | 36 +- src/ShHealOper/ShHealOper_SplitCurve2d.hxx | 36 +- src/ShHealOper/ShHealOper_SplitCurve3d.cxx | 36 +- src/ShHealOper/ShHealOper_SplitCurve3d.hxx | 36 +- src/ShHealOper/ShHealOper_Tool.cxx | 37 +- src/ShHealOper/ShHealOper_Tool.hxx | 36 +- src/TransformationGUI/Makefile.in | 6 +- src/TransformationGUI/TransformationGUI.cxx | 78 +- src/TransformationGUI/TransformationGUI.h | 2 +- .../TransformationGUI_MirrorDlg.cxx | 40 +- .../TransformationGUI_MirrorDlg.h | 10 +- .../TransformationGUI_MultiRotationDlg.cxx | 94 +- .../TransformationGUI_MultiRotationDlg.h | 11 +- .../TransformationGUI_MultiTranslationDlg.cxx | 59 +- .../TransformationGUI_MultiTranslationDlg.h | 11 +- .../TransformationGUI_OffsetDlg.cxx | 34 +- .../TransformationGUI_OffsetDlg.h | 13 +- .../TransformationGUI_PositionDlg.cxx | 46 +- .../TransformationGUI_PositionDlg.h | 12 +- .../TransformationGUI_RotationDlg.cxx | 34 +- .../TransformationGUI_RotationDlg.h | 10 +- .../TransformationGUI_ScaleDlg.cxx | 38 +- .../TransformationGUI_ScaleDlg.h | 12 +- .../TransformationGUI_TranslationDlg.cxx | 57 +- .../TransformationGUI_TranslationDlg.h | 10 +- 1420 files changed, 27010 insertions(+), 30071 deletions(-) delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image28.gif delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_buildgui_functions.htm delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions.htm delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image51.gif delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image52.gif delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image53.gif delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image54.gif delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image55.gif delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions.htm delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions.htm delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions.htm delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions.htm delete mode 100755 doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image130.gif delete mode 100644 doc/salome/gui/GEOM/geompy_doc/GEOM__TestMeasures_8py.html delete mode 100644 doc/salome/gui/GEOM/geompy_doc/doxygen.png delete mode 100644 doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.jpg delete mode 100644 doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.map delete mode 100644 doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.md5 delete mode 100644 doc/salome/gui/GEOM/geompy_doc/namespaceGEOM__TestMeasures.html delete mode 100755 doc/salome/gui/GEOM/pics/creategroup.png delete mode 100755 doc/salome/gui/GEOM/pics/export.png delete mode 100755 doc/salome/gui/GEOM/pics/import.png delete mode 100755 doc/salome/gui/GEOM/whgdata/whlstf14.htm delete mode 100755 doc/salome/gui/GEOM/whgdata/whlstf15.htm delete mode 100755 doc/salome/gui/GEOM/whgdata/whlstt17.htm delete mode 100755 doc/salome/tui/GEOM/doxyfile delete mode 100755 doc/salome/tui/GEOM/doxyfile_py delete mode 100755 doc/salome/tui/GEOM/sources/static/tree.js delete mode 100644 src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx diff --git a/doc/salome/gui/GEOM/ehlpdhtm.js b/doc/salome/gui/GEOM/ehlpdhtm.js index 6cfd2e463..7bcb24993 100755 --- a/doc/salome/gui/GEOM/ehlpdhtm.js +++ b/doc/salome/gui/GEOM/ehlpdhtm.js @@ -1,4239 +1,4239 @@ -// eHelp® Corporation Dynamic HTML JavaScript -// Copyright© 1998-2003 eHelp® Corporation.All rights reserved. -// Version=4.82 - -// Warning:Do not modify this file.It is generated by RoboHELP® and changes will be overwritten. - -//// Segment Begin -- (JavaScript 1.0) - -/// Section Begin - General and relative topics(JavaScript 1.0) - -//{{HH_SYMBOL_SECTION -var HH_ChmFilename = ""; -var HH_WindowName = ""; -var HH_GlossaryFont = ""; -var HH_Glossary = ""; -var HH_Avenue = ""; -var HH_ActiveX = false; -//}}HH_SYMBOL_SECTION - -//Begin to support previous generic parameters -//Get the information about the browser. -var gstrBsAgent = navigator.userAgent.toLowerCase(); -var gnBsVer = parseInt(navigator.appVersion); - -var gbBsOpera = (gstrBsAgent.indexOf('opera') != -1); -var gbBsKonqueror = (gstrBsAgent.indexOf('konqueror') != -1); -var gbBsSafari = (gstrBsAgent.indexOf('safari') != -1); -var gbBsIE = (gstrBsAgent.indexOf('msie') != -1) && !gbBsOpera && !gbBsKonqueror && !gbBsSafari; -var gbBsNS = (gstrBsAgent.indexOf('mozilla') != -1) && ((gstrBsAgent.indexOf('spoofer') == -1) && (gstrBsAgent.indexOf('compatible') == -1)) && !gbBsOpera && !gbBsKonqueror && !gbBsSafari; - -var gbBsMac = (gstrBsAgent.indexOf('mac') != -1); -var gbBsWindows = ((gstrBsAgent.indexOf('win') != -1) || (gstrBsAgent.indexOf('16bit') != -1)); -var gbBsSunOS = (gstrBsAgent.indexOf("sunos") != -1); - -var gbBsIE3Before = ((gbBsIE) && (gnBsVer <= 2)); -var gbBsNS3Before = ((gbBsNS) && (gnBsVer <= 3)); - -var gbBsNS2 = ((gbBsNS) && (gnBsVer <= 2)); -var gbBsNS3 = ((gbBsNS) && (gnBsVer == 3)); -var gbBsIE300301 = ((gbBsIE) && (gnBsVer == 2) && ((gstrBsAgent.indexOf("3.00") != -1)||(gstrBsAgent.indexOf("3.0a") != -1)||(gstrBsAgent.indexOf("3.0b")!=-1)||(gstrBsAgent.indexOf("3.01")!=-1))); -var gbBsIE302 = ((gbBsIE) && (gnBsVer == 2) && (gstrBsAgent.indexOf("3.02") != -1)); - -var gbBsNS4 = ((gbBsNS) && (gnBsVer >= 4)); -var gbBsNS6 = ((gbBsNS) && (gnBsVer >= 5)); -var gbBsNS7 = false; - -var gbBsIE4 = ((gbBsIE) && (gnBsVer >= 4)); -var gbBsIE5 = false; -var gbBsIE55 = false; - -var gbBsOpera6 = false; -var gbBsOpera7 = false; - -var gbBsKonqueror3 = false; - - - -gbBsIE = (navigator.appName.indexOf("Microsoft") != -1) && !gbBsOpera && !gbBsKonqueror && !gbBsSafari;; -if (gbBsIE) -{ - if (parseInt(navigator.appVersion) >= 4) { - gbBsIE4 = true; - if (gbBsIE4) { - var nPos = gstrBsAgent.indexOf("msie"); - var strIEversion = gstrBsAgent.substring(nPos + 5); - var nVersion = parseFloat(strIEversion); - if (nVersion >= 5) - gbBsIE5 = true; - if (nVersion >= 5.5) - gbBsIE55 = true; - } - } -} -if (gbBsNS6) -{ - var nPos=gstrBsAgent.indexOf("gecko"); - if(nPos!=-1) - { - var nPos2=gstrBsAgent.indexOf("/", nPos); - if(nPos2!=-1) - { - var nVersion=parseFloat(gstrBsAgent.substring(nPos2+1)); - if (nVersion>=20020823) - gbBsNS7=true; - } - } -} -if (gbBsOpera) -{ - var nPos = gstrBsAgent.indexOf("opera"); - if(nPos!=-1) - { - var nVersion = parseFloat(gstrBsAgent.substring(nPos+6)); - if (nVersion >= 6) - { - gbBsOpera6=true; - if (nVersion >=7) - gbBsOpera7=true; - } - } -} -if (gbBsKonqueror) -{ - var nPos = gstrBsAgent.indexOf("konqueror"); - if(nPos!=-1) - { - var nVersion = parseFloat(gstrBsAgent.substring(nPos+10)); - if (nVersion >= 3) - { - gbBsKonqueror3=true; - } - } -} - -function insertAdjacentHTML(obj, where, htmlStr) -{ - if (gbBsIE || gbBsOpera7) - { - obj.insertAdjacentHTML(where, htmlStr); - } - else if (gbBsNS6 || gbBsSafari) - { - var r = obj.ownerDocument.createRange(); - r.setStartBefore(obj); - var parsedHTML = r.createContextualFragment(htmlStr); - - switch (where){ - case 'beforeBegin': - obj.parentNode.insertBefore(parsedHTML,obj); - break; - case 'afterBegin': - obj.insertBefore(parsedHTML,obj.firstChild); - break; - case 'beforeEnd': - obj.appendChild(parsedHTML); - break; - case 'afterEnd': - if (obj.nextSibling){ - obj.parentNode.insertBefore(parsedHTML,obj.nextSibling); - } else { - obj.parentNode.appendChild(parsedHTML); - } - break; - } - } -} - -// Utilities functions. -function BsscHasExtJs() -{ - if( gbBsIE3Before || gbBsNS3Before) - return false; - return true; -} - -// Register event handler -var gBsOnLoads = new Array(); // An array holds all the onload event handler. -var gBsOnClicks = new Array(); // An array holds all the onClick event handler. -var gBsOnUnLoads = new Array(); // An array holds all the OnUnLoad event handler. -var gBsOnMouseOvers = new Array(); // An array holds all the OnMouseOver event handler. -var gBsOnMouseOuts = new Array(); // An array holds all the OnMouseOut event handler. - -var gbOrignalOnMouseDown = null; - -function BsscRegisterOnLoad(funcHandler) -{ - var nLength = gBsOnLoads.length; - gBsOnLoads[nLength] = funcHandler; -} - -function BsscRegisterOnClick(funcHandler) -{ - var nLength = gBsOnClicks.length; - gBsOnClicks[nLength] = funcHandler; -} - -function BsscRegisterOnUnLoad(funcHandler) -{ - var nLength = gBsOnUnLoads.length; - gBsOnUnLoads[nLength] = funcHandler; -} - -function BsscRegisterOnMouseOver(funcHandler) -{ - var nLength = gBsOnMouseOvers.length; - gBsOnMouseOvers[nLength] = funcHandler; -} - -function BsscRegisterOnMouseOut(funcHandler) -{ - var nLength = gBsOnMouseOuts.length; - gBsOnMouseOuts[nLength] = funcHandler; -} - -function BsGeneralOnLoad() -{ - if (!gbBsIE4 && !gbBsNS4) - return; - - // Make everything visible in navigator - if (gbBsNS4 && !gbBsNS6) { - // Make some special effects items visible - for (var iLayer = 0; iLayer < document.layers.length; iLayer++) { - document.layers[iLayer].visibility = "show"; - document.layers[iLayer].left = 0; - } - } -} - -// If resize the netscape browser, need to reload it. -function BsReDo() -{ - if (innerWidth != origWidth || innerHeight != origHeight) - location.reload(); -} -// End of the local functions. - -// The following functions are used by the html files. -function BSSCOnLoad() -{ - if( !BsscHasExtJs() ) - return; - for (var nElement = gBsOnLoads.length - 1; nElement >= 0; nElement--) - gBsOnLoads[nElement](); -} - -function BSSCOnClick() -{ - if (!BsscHasExtJs()) return; - - for (var nElement = gBsOnClicks.length - 1; nElement >= 0; nElement--) - gBsOnClicks[nElement](); -} - -function BSSCOnUnload() -{ - if (!BsscHasExtJs()) return; - for (var nElement = gBsOnUnLoads.length - 1; nElement >= 0; nElement--) - gBsOnUnLoads[nElement](); -} - -function BSSCOnMouseOver() -{ - if (!BsscHasExtJs()) return; - for (var nElement = gBsOnMouseOvers.length - 1; nElement >= 0; nElement--) - gBsOnMouseOvers[nElement](); -} - -function BSSCOnMouseOut() -{ - if (!BsscHasExtJs()) return; - for (var nElement = gBsOnMouseOuts.length - 1; nElement >= 0; nElement--) - { - gBsOnMouseOuts[nElement](); - } -} -// End of invocation of the event handle functions. - -// Add the GereralOnLoad to the onload array. -if (typeof(BsscRegisterOnLoad) != "undefined") -{ - BsscRegisterOnLoad(BsGeneralOnLoad); -} -if (gbBsNS4&&!gbBsNS6) { - origWidth = innerWidth; - origHeight = innerHeight; - onresize = BsReDo; -} -//End to support previous generic parameters - -//Begin to support previous HHActiveX invoking -function BsHHActivateComponents() -{ - if( HH_ActiveX && (HH_ChmFilename != "") && ((self == top) || (self == top.frames[0]))) - { - var objBody = getElementsByTag(document,"BODY")[0]; - if( typeof(objBody) == "object" ) - { - insertAdjacentHTML(objBody, "beforeEnd", ''); - if (HHComponentActivator.object) - HHComponentActivator.Activate(HH_ChmFilename, HH_WindowName, HH_GlossaryFont, HH_Glossary, HH_Avenue); - } - } -} - -function BsHHActivXOnLoad() -{ - if( gbBsIE4 ) - BsHHActivateComponents(); -} - -if( typeof(BsscRegisterOnLoad) != "undefined" ) -{ - BsscRegisterOnLoad(BsHHActivXOnLoad); -} -//End to support previous HHActiveX invoking - -//Begin to support previous relative topics -//If webHelp needs Related Topics DHTMLcode, it's supposed to add it here -var gbPopupMenuTimeoutExpired = false; -var gbInPopupMenu = false; -var gbPopupMenuTopicList = null; -var gOlddocumentClick = null; - -////////////////////////////////////////////////////////////////////////////////////////// -// -// Popup Menu code -// -////////////////////////////////////////////////////////////////////////////////////////// - -var g_bIsPopupMenuInit = false; -function _WritePopupMenuLayer() -{ - if (!g_bIsPopupMenuInit) - { - if (gbBsNS4&&!gbBsNS6) { -//Do not try to write ininle styles for NS! NS can not handle it and will not stop downloading the html page... - document.write("
"); - } else{ - document.write(""); - if (!(gbBsNS4&&!gbBsNS6)) { - document.write(""); - } - } - g_bIsPopupMenuInit = true; - } -} - -//Seek for the bsscright frame -function _SeekFrameByName( cRoot, strName ) -{ - if( cRoot == null ) return null; - if( cRoot.frames == null ) return null; - if( cRoot.frames[strName] != null ) return cRoot.frames[strName]; - for (var i=0; i'; - } else { - strMenu += '' + gbPopupMenuTopicList[fn_arguments[i]].strTitle + ''; - } - strMenu += ''; - - if (isNaN(fn_arguments[i]) || (gbPopupMenuTopicList == null)) { - i += 2; - } else { - i += 1; - } - } - strMenu += ""; - - if (gbBsMac) { - // totally hack. because ie5 in mac need something. is one of them. mac is mad. - strMenu +="
"; - } - - var layerPopup = null; - var stylePopup = null; - var nEventX = 0; - var nEventY = 0; - var nWindowWidth = 0; - if (gbBsIE4 || gbBsOpera7) { - - layerPopup = getElement("PopupMenu"); - layerPopup.innerHTML = strMenu; - stylePopup = layerPopup.style; - - _BSPSGetClientSize(); - - // Get the position of the item causing the event (relative to its parent) - nEventX = window.event.clientX; - nEventY = window.event.clientY; - - if (nEventY + layerPopup.scrollHeight + 10 < gBsClientHeight) { - nEventY += document.body.scrollTop + 10; - } else { - nEventY = (document.body.scrollTop + gBsClientHeight) - layerPopup.scrollHeight - 20; - } - stylePopup.top = nEventY; - - var nPopupWidth = layerPopup.scrollWidth; - if (gbBsMac) { - nPopupWidth = 80; // we have no idea how to get the dynamic width of the popup. - } - if (nEventX + nPopupWidth + 20 > gBsClientWidth) { - if (gBsClientWidth - nPopupWidth < 5) { - stylePopup.left = 5; - } else { - stylePopup.left = gBsClientWidth - nPopupWidth - 5; - } - } else { - stylePopup.left = nEventX + document.body.scrollLeft + 20; - } - - stylePopup.visibility = "visible"; - if (!gOlddocumentClick && document.onclick) - gOlddocumentClick = document.onclick; - document.onclick = PopupMenu_HandleClick; - - } else if (gbBsNS6 || gbBsKonqueror3||gbBsSafari) { - layerPopup = getElement("PopupMenu"); - layerPopup.style.visibility = "hidden"; - - if (gbBsNS6) - { - var e = fn_arguments[0]; - nEventX = e.pageX; - nEventY = e.pageY; - } - else - { - nEventX = window.event.clientX; - nEventY = window.event.clientY; - } - _BSPSGetClientSize(); - layerPopup.innerHTML = strMenu; - - if (nEventY + layerPopup.offsetHeight + 20 < window.pageYOffset + gBsClientHeight) { - nEventY += 20; - } else { - nEventY = gBsClientHeight + window.pageYOffset - layerPopup.offsetHeight - 20; - } - - if (nEventX + layerPopup.offsetWidth + 20 > gBsClientWidth + window.pageXOffset) { - if (gBsClientWidth + window.pageXOffset - layerPopup.offsetWidth < 20) { - nEventX = 5; - } else { - nEventX = gBsClientWidth + window.pageXOffset - layerPopup.offsetWidth - 20; - } - } else { - nEventX += 20; - } - layerPopup.style.top = nEventY; - layerPopup.style.left = nEventX; - // set again to avoid the stupid frash in netscape 6. - layerPopup.innerHTML = strMenu; - layerPopup.style.visibility = "visible"; - //window.captureEvents(Event.MOUSEDOWN); - if (!gOlddocumentClick && document.onclick) - gOlddocumentClick = document.onclick; - window.onclick = PopupMenu_HandleClick; - } - else if (gbBsNS4) { - layerPopup = document.layers.PopupMenu; - layerPopup.visibility = "hide"; - stylePopup = layerPopup.document; - stylePopup.write(strMenu); - stylePopup.close(); - var e = fn_arguments[0]; - nEventX = e.pageX; - nEventY = e.pageY; - _BSPSGetClientSize(); - if (nEventY + layerPopup.clip.height + 20 < window.pageYOffset + gBsClientHeight) { - nEventY += 20; - } else { - nEventY = gBsClientHeight + window.pageYOffset- layerPopup.clip.height - 20; - } - layerPopup.top = nEventY; - - if (nEventX + layerPopup.clip.width + 20 > gBsClientWidth + window.pageXOffset) { - if (gBsClientWidth + window.pageXOffset - layerPopup.clip.width < 20) { - nEventX = 5; - } else { - nEventX = gBsClientWidth + window.pageXOffset - layerPopup.clip.width - 20; - } - } else { - nEventX += 20; - } - - layerPopup.left = nEventX; - - layerPopup.visibility = "show"; - - window.captureEvents(Event.MOUSEDOWN); - if (!gOlddocumentClick && document.onmousedown) - gOlddocumentClick = document.onmousedown; - window.onmousedown = PopupMenu_HandleClick; - } - - window.gbInPopupMenu = true; - window.gbPopupMenuTimeoutExpired = false; - setTimeout("PopupMenu_Timeout();", 100); - return false; -} - -function PopupMenu_Timeout() -{ - window.gbPopupMenuTimeoutExpired = true; -} - -function PopupMenu_Over(e) -{ - if (gbBsIE4||gbBsOpera7) - e.srcElement.className = "PopupOver"; - else if (gbBsNS6) - e.target.parentNode.className = "PopupOver"; - return; -} - -function PopupMenu_Out(e) -{ - if (gbBsIE4||gbBsOpera7) - e.srcElement.className = "PopupNotOver"; - else if (gbBsNS6) - e.target.parentNode.className = "PopupNotOver"; - return; -} - -function PopupMenu_HandleClick(e) -{ - if (window.gbPopupMenuTimeoutExpired) { - window.gbInPopupMenu = false; - if (gbBsNS4 && !gbBsNS6) { - window.releaseEvents(Event.MOUSEDOWN); - } - - var layerPopup = null; - if (gbBsNS4&&!gbBsNS6) { - layerPopup = document.layers.PopupMenu; - layerPopup.visibility = "hide"; - } else { - layerPopup = getElement("PopupMenu"); - layerPopup.style.visibility = "hidden"; - } - - if (gOlddocumentClick) - { - if (gbBsNS4 && !gbBsNS6) - document.onmousedown = gOlddocumentClick; - else - document.onclick = gOlddocumentClick; - } - } - return; -} - -function BSSCPopup_ClickMac() -{ - if ((!DHTMLPopupSupport()) && (gbBsIE4 || gbBsOpera7)) - { - var bClickOnAnchor = false; - var el; - if ((window.event != null) && - (window.event.srcElement != null)) - { - el = window.event.srcElement; - while (el != null) - { - if ((el.tagName == "A") || (el.tagName == "AREA")) { - bClickOnAnchor = true; - break; - } - if (el.tagName == "BODY") { - break; - } - el = getParentNode(el); - } - } - if (BSSCPopup_IsPopup()) - { - if (!bClickOnAnchor) { - parent.window.gPopupWindow = null; - self.close(); - } - } - else - { - bClosePopupWindow = true; - if ((bClickOnAnchor) && - (el.href) && - ((el.href.indexOf("javascript:BSSCPopup") != -1) || (el.href.indexOf("javascript:null") != -1) || (el.href.indexOf("javascript:void(0)") != -1))) - { - bClosePopupWindow = false; - } - if (bClosePopupWindow) - { - if (window.gPopupWindow != null && !window.gPopupWindow.closed ) - { - window.gPopupWindow.close(); - } - } - } - } -} - -function BsPopupOnClick() -{ - if (!gbBsIE4 && !gbBsOpera7) - return; - - BSSCPopup_ClickMac(); -} - -function _BSSCOnError(message) -{ - if(-1 != message.indexOf("denied") - || -1 != message.indexOf("Object required")) - return true; -} - -//End to support previous relative topics - -/// Section End - General and relative topics (JavaScript 1.0) - -/// Section Begin - Popup (JavaScript 1.0) -//Begin to support previous popup functions - -//variables used to isolate the browser type -var gBsStyVisShow = null; -var gBsStyVisHide = null; -var gBsClientWidth = 640; -var gBsClientHeight = 480; - -// here is the varible for judge popup windows size. these parameter is for IE5.0, it may need adjust for others. -var gBRateH_W = 0.618; // 1.618 Golden cut. -var gBMaxXOfParent = 0.8; -var gBMaxYOfParent = 0.8; -var gBscrollHeight = 16; -var gBscrollWidth = 16; -var gBpermitXDelta = 3; -var gBpermitYDelta = 3; - - -var arrayPopupURL = new Array(); -var arrayAbsPopupURL = new Array(); - -var arrayDirty = new Array(); - -function setAbsPopupURL(nIndex, strURL) -{ - arrayAbsPopupURL[nIndex] = strURL; -} - -function getAbsPopupURL(nIndex) -{ - if (nIndex == -1 || arrayAbsPopupURL.length <= nIndex) return null; - else - return arrayAbsPopupURL[nIndex]; -} - -function getPopupURL(nIndex) -{ - if (nIndex == -1 || arrayPopupURL.length <= nIndex) return null; - else - return arrayPopupURL[nIndex]; -} - -function getPopupID(nIndex) -{ - return gstrPopupID + nIndex; -} - -function getPopupShadowID(nIndex) -{ - return gstrPopupShadowID + nIndex; -} - -function getPopupTopicID(nIndex) -{ - return gstrPopupTopicID + nIndex; -} - -function getPopupIFrameID(nIndex) -{ - return gstrPopupIFrameID + nIndex; -} - -function getPopupIFrameName(nIndex) -{ - return gstrPopupIFrameName + nIndex; -} - - -function getPopupTopicStyle(nIndex) -{ - return getElement(getPopupTopicID(nIndex)).style; -} - -function getPopupShadowStyle(nIndex) -{ - return getElement(getPopupShadowID(nIndex)).style; -} - -function getPopupIFrame(nIndex) -{ - if (gbBsNS6) - return eval("window.frames['" + getPopupIFrameName(nIndex) + "']"); - else - return eval("document.frames['" + getPopupIFrameName(nIndex) + "']"); -} - -function getPopupDivStyle(nIndex) -{ - return getElement(getPopupID(nIndex)).style; -} - -function getPopupIFrameStyle(nIndex) -{ - return getElement(getPopupIFrameID(nIndex)).style; -} - - -function findDiv(strURL) -{ - for (var i = 0; i < arrayPopupURL.length; i ++ ) { - if (arrayPopupURL[i] == strURL) { - return i; - } - } - return -1; -} - -var gnToken = -1; -function takeToken() -{ - gnToken ++; - if (gnToken > 10000) gnToken = 0; - return gnToken; -} - -function IsValidToken(nToken) -{ - return (gnToken == nToken); -} - -function addDiv(strURL) -{ - for (var i = 0; i < arrayPopupURL.length; i ++) { - if (arrayPopupURL[i] == null) { - arrayPopupURL[i] = strURL; - return i; - } - } - arrayPopupURL[i] = strURL; - arrayDirty[i] = true; - return i; -} - -function setDirty() -{ - for (var i = 0; i < arrayPopupURL.length; i ++ ) - arrayDirty[i] = true; -} - -function IsDirty(nIndex) -{ - if (nIndex == -1) - return true; - else - if (arrayDirty.length > nIndex) - return arrayDirty[nIndex]; - else - return true; -} - -function hideAll() -{ - for (var i = 0; i < arrayPopupURL.length; i ++ ) - { - getPopupDivStyle(i).visibility = gBsStyVisHide; - getPopupIFrameStyle(i).visibility = gBsStyVisHide; - } -} - -function getCurrentPopupIFrame() -{ - for (var i = 0; i < arrayPopupURL.length; i ++) - if (getPopupDivStyle(i).visibility == gBsStyVisShow) - return getPopupIFrame(i); - return null; -} - -function setClear(nIndex) -{ - if (nIndex != -1) - arrayDirty[nIndex] = false; -} - -function _BSSCCreatePopupDiv(strURL) -{ - var nIndex = findDiv(strURL); - if (nIndex == -1 ) { - nIndex = addDiv(strURL); - BsPopup_CreateDiv(nIndex); - } - else { - if (IsDirty(nIndex)) { - if("object" == typeof(getPopupIFrame(nIndex).document)) - getPopupIFrame(nIndex).document.location.href = strURL; - } - } - return nIndex; -} - -//Here is the browser type -function _BSPSGetBrowserInfo() -{ - if (gbBsNS4&&!gbBsNS6) - { - gBsStyVisShow = "show"; - gBsStyVisHide = "hide"; - } - else - { - gBsStyVisShow = "visible"; - gBsStyVisHide = "hidden"; - } -} - -_BSPSGetBrowserInfo(); - -//Get client size info -function _BSPSGetClientSize() -{ - if (gbBsNS4||gbBsKonqueror3||gbBsSafari) - { - gBsClientWidth = innerWidth; - gBsClientHeight = innerHeight; - } - else if (gbBsIE4 || gbBsOpera7) - { - gBsClientWidth = document.body.clientWidth; - gBsClientHeight = document.body.clientHeight; - } -} - -var gstrPopupID = 'BSSCPopup'; -var gstrPopupShadowID = 'BSSCPopupShadow'; -var gstrPopupTopicID = 'BSSCPopupTopic'; -var gstrPopupIFrameID = 'BSSCPopupIFrame'; -var gstrPopupIFrameName = 'BSSCPopupIFrameName'; - -var gstrPopupSecondWindowName = 'BSSCPopup'; - -var gPopupWindow = null; -var gnPopupClickX = 0; -var gnPopupClickY = 0; - -var gnPopupScreenClickX = 0; -var gnPopupScreenClickY = 0; - -var gbPopupTimeoutExpired = false; - -function DHTMLPopupSupport() -{ - if (((gbBsIE4) && (!gbBsMac))||gbBsOpera7|| gbBsNS7) { - return true; - } - return false; -} - -function BSSCPopup_IsPopup() -{ - if (DHTMLPopupSupport() && (this.name.indexOf(gstrPopupIFrameName) != -1)) { - return true; - } else if ((gbBsNS4 || gbBsIE4 || gbBsOpera7) && (this.name.indexOf(gstrPopupID) != -1)) { - return true; - } else { - return false; - } -} - -// If there is a hyperlink in a popup window, display the hyperlink in -// the original window. (bsscright) -if (BSSCPopup_IsPopup() && !gbBsIE4 && !gbBsOpera7) { - document.write(""); -} - -// Local functions. -function BsPopup_CreateDiv(nIndex) -{ - if(!DHTMLPopupSupport()) - return; - // DO NOT SET Width and height for the div, otherwize it will make IE4 popup do not work when view the topic alone. - var strPopupDiv = ""; - - var objBody = getElementsByTag(document, "BODY")[0]; - if( typeof(objBody) != "object" ) - return; - - insertAdjacentHTML(objBody, "beforeEnd", strPopupDiv); -} - -function handleLoadNS() -{ - if (this.id) - { - var nIndex = parseInt(this.id.substring(gstrPopupIFrameID.length)); - BSSCPopup_PostWork(nIndex); - } -} - -function BSSCPopup_PostWork(nIndex) -{ - getPopupDivStyle(nIndex).visibility = gBsStyVisShow; - getPopupIFrameStyle(nIndex).visibility =gBsStyVisShow; - - setClear(nIndex); - window.gbPopupTimeoutExpired = true; - - BSSCPopup_ChangeTargettoParent(getPopupIFrame(nIndex).document); - if (gbBsNS6) - getPopupIFrame(nIndex).document.body.addEventListener("click",BSSCPopupClicked,false); - else - getPopupIFrame(nIndex).document.body.onclick = BSSCPopupClicked; - - if (!gbOrignalOnMouseDown && document.onmousedown) - gbOrignalOnMouseDown = document.onmousedown; - - if (gbBsNS6) - document.addEventListener("mousedown", BSSCPopupParentClicked,false); - else - document.onmousedown = BSSCPopupParentClicked; -} - -function BSSCPopup_Timeout(nIndex, nToken) -{ - if (!IsValidToken(nToken)) return; - - if (gbBsNS6||((getPopupIFrame(nIndex).document.readyState == "complete") && - (getPopupIFrame(nIndex).document.body != null))) { - BSSCPopup_PostWork(nIndex); - } else { - setTimeout("BSSCPopup_Timeout(" + nIndex + "," + nToken + ")", 100); - } -} - -// VH 08/10/00 -// do not change target to parent if the href is using javascript -function BSSCPopup_ChangeTargettoParent(tagsObject) -{ - var collA = getElementsByTag(tagsObject, "A"); - BSSCPopup_ChangeTargettoParent2(collA); - - var collIMG = getElementsByTag(tagsObject,"IMG"); - BSSCPopup_ChangeTargettoParent2(collIMG); -} - -function BSSCPopup_ChangeTargettoParent2(colls) -{ - if (colls != null) { - for (var j = 0; j < colls.length; j ++ ) - { - var strtemp = colls[j].href; - if (strtemp) - { - strtemp = strtemp.toLowerCase(); - if (strtemp.indexOf("javascript:") == -1) - if (colls[j].target == "") - colls[j].target = "_parent"; - } - } - } -} - -function BSPSPopupTopicWinHelp(strURL) -{ - _BSSCPopup(strURL); - return; -} - -function _BSSCPopup(strURL, width, height) -{ - var cuswidth = 0; - var cusheight = 0; - if ("undefined" != typeof(width) && "undefined" != typeof(height)) { - cuswidth = width; - cusheight= height; - } - - if (DHTMLPopupSupport()) { - var nToken = takeToken(); // take token first. - var nIndex = _BSSCCreatePopupDiv(strURL); - window.gbPopupTimeoutExpired = false; - var ntWidth = gBsClientWidth; - var ntHeight = gBsClientHeight; - _BSPSGetClientSize(); - if (ntWidth != gBsClientWidth || ntHeight != gBsClientHeight) { - setDirty(); - } - - if (IsDirty(nIndex)) { - if (gbBsMac) { - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight +")", 400); - } else { - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight + ")", 100); - } - } - else { - MoveDivAndShow(nIndex ,nToken, cuswidth, cusheight); - } - } else { - _BSSCPopup2(strURL, cuswidth, cusheight); - } - return; -} - -if (gbBsIE55) -{ - var ehlpdhtm_fOldBefureUnload = window.onbeforeunload; - var gnBsUnload=0; - window.onbeforeunload = window_BUnload; -} - -function window_BUnload() -{ - gnBsUnload++; - if (gnBsUnload>1) - return; - for (var i = 0; i < arrayPopupURL.length; i ++) - removeThis(document.all(getPopupID(i))); - arrayPopupURL.length = 0; - if (ehlpdhtm_fOldBefureUnload) - ehlpdhtm_fOldBefureUnload(); -} - -function _BSSCPopup2(strURL, width, height) -{ - if (gbBsOpera6&&gbBsMac) - { - var wmTemp = window.open(document.location.href, gstrPopupSecondWindowName); - wmTemp.close(); - setTimeout("_BSSCPopup3(\""+strURL+"\","+width+","+height+");",100); - } - else - _BSSCPopup3(strURL, width, height); -} - -function _BSSCPopup3(strURL, width, height) -{ - if (window.name == gstrPopupSecondWindowName) { - window.location = strURL; - } else { - if (!gbBsMac || !gbBsNS4) { - BSSCHidePopupWindow(); - } - var nX = 0; - var nY = 0; - var nHeight = 300; - var nWidth = 400; - if (width > 0 && height > 0) { - nHeight = height; - nWidth = width; - } - _BSPSGetClientSize(); - - nX = window.gnPopupScreenClickX; - nY = window.gnPopupScreenClickY; - - if (nY + nHeight + 40 > screen.availHeight) { - nY = screen.availHeight - nHeight - 40; - } - if (nX + nWidth + 40 > screen.availWidth) { - nX = screen.availWidth - nWidth - 40; - } - - // Launch a separate window - var strParam="titlebar=no,toolbar=no,status=no,location=no,menubar=no,resizable=yes,scrollbars=yes"; - if (gbBsNS) { - if (gbBsNS6) { - strParam += ",Height=" + nHeight + ",Width=" + nWidth; - strParam += ",screenX=" + nX + ",screenY=" + nY; - strParam += ",dependent=yes"; - } - else { - strParam += ",OuterHeight=" + nHeight + ",OuterWidth=" + nWidth; - strParam += ",screenX=" + nX + ",screenY=" + nY; - strParam += ",dependent=yes"; - } - } - else { - strParam += ",height=" + nHeight + ",width=" + nWidth; - strParam += ",left=" + nX + ",top=" + nY; - } - if (gbBsSafari) - { - if (window.gPopupWindow) - window.gPopupWindow.close(); - window.gPopupWindow = window.open(strURL, "", strParam); - window.gPopupWindow.name = gstrPopupSecondWindowName; - window.gPopupWindow.moveTo(nX, nY); - widnow.gPopupWindow.document.location.reload(); - } - else - { - var wmTemp=null; - if (gbBsKonqueror3) - { - if (window.gPopupWindow) - window.gPopupWindow.close(); - } - if (gbBsOpera&&gbBsMac) - { - wmTemp= window.open(document.location.href, "Temp", strParam); - } - window.gPopupWindow = window.open(strURL, gstrPopupSecondWindowName, strParam); - if (!gbBsIE) - window.gPopupWindow.focus(); - - if (wmTemp) - wmTemp.close(); - } - - if (gbBsNS4) - setEventHandle(); - else if (gbBsIE4 || gbBsOpera7||gbBsKonqueror3) - setTimeout("setPopupFocus();", 100); - } - return; -} - -function setEventHandle() -{ - window.gPopupWindow.captureEvents(Event.CLICK | Event.BLUR); - window.gPopupWindow.onclick = NonIEPopup_HandleClick; - window.gPopupWindow.onblur = NonIEPopup_HandleBlur; -} - -function setPopupFocus() -{ - window.gPopupWindow.focus(); -} - -function NonIEPopup_HandleBlur(e) -{ - window.gPopupWindow.focus(); -} - -function NonIEPopup_HandleClick(e) -{ - // Because navigator will give the event to the handler before the hyperlink, let's - // first route the event to see if we are clicking on a Popup menu in a popup. - document.routeEvent(e); - - // If a popup menu is active then don't do anything with the click - if (window.gPopupWindow.gbInPopupMenu) { - window.gPopupWindow.captureEvents(Event.CLICK); - window.gPopupWindow.onclick = NonIEPopup_HandleClick; - return false; - } - - // Close the popup window - if(e.target.href) - { - if(e.target.href.indexOf("javascript:")==-1) - { - if (e.target.target=="") - window.location.href = e.target.href; - else - window.open(e.target.href, e.target.target); - this.close(); - } - } - else - this.close(); - return false; -} - -function BSSCPopup_AfterLoad(nIndex, nToken, cuswidth, cusheight) -{ - if (!window.getPopupIFrame(nIndex).document) { - _BSSCPopup2(getPopupURL(nIndex), cuswidth, cusheight); - return; - } - - if (!IsValidToken(nToken)) return; - - if (gbBsNS6) - { - setAbsPopupURL(nIndex, window.getPopupIFrame(nIndex).document.location.href); // change URL to abs url. - BSSCPopup_ResizeAfterLoad(nIndex, nToken, cuswidth, cusheight); - return; - } - - if ((window.getPopupIFrame(nIndex).document.readyState == "complete") && - (window.getPopupIFrame(nIndex).document.body != null)) { - if (window.getPopupIFrame(nIndex).document.location.href.indexOf("about:blank") != -1) { // add this check. IE will use about:blank" as the default vaule for Iframe. - window.getPopupIFrame(nIndex).document.location = getPopupURL(nIndex); - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight + ")", 200); - } - else - { - setAbsPopupURL(nIndex, window.getPopupIFrame(nIndex).document.location.href); // change URL to abs url. - BSSCPopup_ResizeAfterLoad(nIndex, nToken, cuswidth, cusheight); - } - } else { - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight + ")", 200); - } -} - -function BSSCPopup_ResizeAfterLoad(nIndex, nToken, cuswidth, cusheight) -{ - if (window.gbPopupTimeoutExpired) return; - - if (!IsValidToken(nToken)) return; - - getPopupDivStyle(nIndex).visibility = gBsStyVisHide; - getPopupIFrameStyle(nIndex).visibility = gBsStyVisHide; - - // Determine the width and height for the window - _BSPSGetClientSize(); - - var size = new BSSCSize(0, 0); - - if (cuswidth <= 0 || cusheight <= 0) - BSSCGetContentSize(window.getPopupIFrame(nIndex), size); - else { - size.x = cuswidth; - size.y = cusheight; - } - - // Determine the width and height for the window - var nWidth = size.x; - var nHeight = size.y; - - // for small popup size, we should allow any size. - // The popup size should be ok if bigger than 0 - if (nWidth < 0 || nHeight < 0) return; // there must be something terribly wrong. - - getPopupDivStyle(nIndex).width = nWidth; - getPopupDivStyle(nIndex).height = nHeight; - - getPopupShadowStyle(nIndex).width = nWidth; - getPopupShadowStyle(nIndex).height = nHeight; - getPopupTopicStyle(nIndex).width = nWidth; - getPopupTopicStyle(nIndex).height = nHeight; - if (gbBsIE55) - { - getPopupShadowStyle(nIndex).width = nWidth + 2; - getPopupShadowStyle(nIndex).height = nHeight + 2; - getPopupTopicStyle(nIndex).width = nWidth + 2; - getPopupTopicStyle(nIndex).height = nHeight + 2; - } - - getPopupIFrameStyle(nIndex).width = nWidth; - getPopupIFrameStyle(nIndex).height = nHeight; - if (gbBsIE55 || gbBsNS6) - { - getPopupIFrameStyle(nIndex).top = 0; - getPopupIFrameStyle(nIndex).left = 0; - } - - var strURL = getPopupURL(nIndex); - if (strURL.indexOf("#") != -1&&gbBsNS6) - getPopupIFrame(nIndex).location.reload(); - else if (strURL.indexOf("#") != -1||gbBsNS6) - getPopupIFrame(nIndex).location.href = strURL; // reload again, this will fix the bookmark misunderstand in IE5. - - MoveDivAndShow(nIndex, nToken, cuswidth, cusheight); -} - -function getScrollLeft() -{ - if (document.body.scrollLeft) - return document.body.scrollLeft; - else if (window.pageXOffset) - return window.pageXOffset; - else - return 0; -} - -function getScrollTop() -{ - if (document.body.scrollTop) - return document.body.scrollTop; - else if (window.pageYOffset) - return window.pageYOffset; - else - return 0; -} - - -function MoveDivAndShow(nIndex, nToken, cuswidth, cusheight) -{ - if (window.getPopupIFrame(nIndex).document.location.href != getAbsPopupURL(nIndex)) { // if redirect, reload again. - window.getPopupIFrame(nIndex).document.location = getPopupURL(nIndex); - setTimeout("BSSCPopup_AfterLoad(" + nIndex + "," + nToken + "," + cuswidth + "," + cusheight + ")", 200); - return; - } - - // Determine the position of the window - var nClickX = window.gnPopupClickX; - var nClickY = window.gnPopupClickY; - var nTop = 0; - var nLeft = 0; - - var nWidth = parseInt(getPopupDivStyle(nIndex).width); - var nHeight = parseInt(getPopupDivStyle(nIndex).height); - - if (nClickY + nHeight + 20 < gBsClientHeight + getScrollTop()) { - nTop = nClickY + 10; - } else { - nTop = (getScrollTop() + gBsClientHeight) - nHeight - 20; - } - if (nClickX + nWidth < gBsClientWidth + getScrollLeft()) { - nLeft = nClickX; - } else { - nLeft = (getScrollLeft() + gBsClientWidth) - nWidth - 8; - } - - if (nTop < getScrollTop()) nTop = getScrollTop() + 1; - if (nLeft< getScrollLeft()) nLeft = getScrollLeft() + 1; - - getPopupDivStyle(nIndex).left = nLeft; - getPopupDivStyle(nIndex).top = nTop; - - // Set the location of the background blocks - getPopupShadowStyle(nIndex).left = 6; - getPopupShadowStyle(nIndex).top = 6; - if (gbBsIE55) - { - getPopupShadowStyle(nIndex).left = 4; - getPopupShadowStyle(nIndex).top = 4; - } - - if (gbBsMac&&gbBsIE4) { - // Total hack on the iMac to get the IFrame to position properly - getPopupIFrameStyle(nIndex).pixelLeft = 100; - getPopupIFrameStyle(nIndex).pixelLeft = 0; - // Explicitly call BSSCOnLoad because the Mac doesn't seem to do it - getPopupIFrame(nIndex).window.BSSCOnLoad(); - } - - if (gbBsNS6&&IsDirty(nIndex)) - getElement(getPopupIFrameID(nIndex)).addEventListener("load", handleLoadNS, false); - else - BSSCPopup_Timeout(nIndex , nToken ); - return; -} - -function BSSCSize(x, y) -{ - this.x = x; - this.y = y; -} - -function BSSCGetContentSize(thisWindow, size) -{ - if (!gbBsIE4 && !gbBsOpera7 && !gbBsNS4) - return; - - if ((gbBsMac&&gbBsIE4)||gbBsNS4||gbBsOpera7) { - size.x = 320; - size.y = 180; - return; - } - - // Resize the width until it is wide enough to handle the content - // The trick is to start wide and determine when the scrollHeight changes - // because then we know a scrollbar is necessary. We can then go back - // to the next widest size (for no scrollbar) - - var ClientRate = gBsClientHeight / gBsClientWidth; - - - var GoldenSize = new BSSCSize(0,0); - GoldenSize.x = gBsClientWidth * gBMaxXOfParent; - GoldenSize.y = gBsClientHeight *gBMaxYOfParent ; - - if (ClientRate > gBRateH_W) { - GoldenSize.y = GoldenSize.x * gBRateH_W; - } - else { - GoldenSize.x = GoldenSize.y / gBRateH_W; - } - - // Try to using parent specified max x. - var x = 0; - var maxgoldx = GoldenSize.x; - var maxx = gBsClientWidth * gBMaxXOfParent; - - // This double resize causes the document to re-render (and we need it to) - if (!gbBsIE5) - thisWindow.moveTo(10000,10000); // this is used to fix the flash on IE4. - - thisWindow.resizeTo(1, 1); - thisWindow.resizeTo(1, 1); - thisWindow.resizeTo(maxgoldx, thisWindow.document.body.scrollHeight + gBscrollHeight); - thisWindow.resizeTo(maxgoldx, thisWindow.document.body.scrollHeight + gBscrollHeight); - - var miny = thisWindow.document.body.scrollHeight + gBscrollHeight; - - if (miny > GoldenSize.y) // the popup does not fix in the parent wanted golden area. so try to expand itself as large as it can - { - thisWindow.resizeTo(maxx , thisWindow.document.body.scrollHeight + gBscrollHeight); - thisWindow.resizeTo(maxx , thisWindow.document.body.scrollHeight + gBscrollHeight); - - miny = thisWindow.document.body.scrollHeight + gBscrollHeight; - maxy = gBsClientHeight * gBMaxYOfParent; - - if (miny > maxy) { // the popup must have a scroll, OK let it be. - miny = maxy; - size.x = maxx; - size.y = maxy; - thisWindow.document.body.scroll = 'yes'; // At this time we do want to show scroll any more. so it will looks better a little. - } - else { // popup still can fit in the parent area by someway. now we choose the same h/w rate as parent. - size.y = miny; - - // downsize from maxx , now I try to using binary divide. - x = maxx; - deltax = -maxx/2; - //j = 0; - while (true) { - x = x + deltax; - thisWindow.resizeTo(x, miny); - thisWindow.resizeTo(x, miny); - diffy = thisWindow.document.body.scrollHeight + gBscrollHeight - x * ClientRate; - if (diffy > gBpermitYDelta ) // it is higher than wanted, so x need to be wide a little bitter - deltax = Math.abs(deltax) /2; - else if (diffy < -gBpermitYDelta) // it is shorter than wanted, so x need to be narrow a little bitter - deltax = -Math.abs(deltax) /2; - else - // the y is close enough to wanted. - break; - if (Math.abs(deltax) < gBpermitXDelta) // the next change is too slight and it can be ignore. - break; - } - size.x = thisWindow.document.body.scrollWidth; //+ gBscrollWidth; - size.y = thisWindow.document.body.scrollHeight;// + gBscrollHeight; - thisWindow.document.body.scroll = 'no'; - } - } - else { - if (thisWindow.document.body.scrollWidth > maxgoldx) { - size.x = maxx; - size.y = miny; - thisWindow.document.body.scroll = 'yes'; - } - else { - // downsize from maxgoldx , now I try to using binary divide. - x = maxgoldx; - deltax = -maxgoldx/2; - while (true) { - x = x + deltax; - thisWindow.resizeTo(x, miny); - thisWindow.resizeTo(x, miny); - diffy = thisWindow.document.body.scrollHeight + gBscrollHeight - x * gBRateH_W; - if (diffy > gBpermitYDelta ) // it is higher than wanted, so x need to be wide a little bitter - deltax = Math.abs(deltax) /2; - else if (diffy < -gBpermitYDelta) // it is shorter than wanted, so x need to be narrow a little bitter - deltax = -Math.abs(deltax) /2; - else - // the y is close enough to wanted. - break; - if (Math.abs(deltax) < gBpermitXDelta) // the next change is too slight and it can be ignore. - break; - } - size.x = thisWindow.document.body.scrollWidth; //+ gBscrollWidth; - size.y = thisWindow.document.body.scrollHeight ; - thisWindow.document.body.scroll = 'no'; // At this time we do not want to show scroll any more. so it will looks better a little. - thisWindow.resizeTo(size.x, size.y); - if (thisWindow.document.body.scrollWidth > size.x) - { - size.x = thisWindow.document.body.scrollWidth; - } - if (thisWindow.document.body.scrollHeight > size.y) - { - size.y = thisWindow.document.body.scrollHeight; - } - } - } - thisWindow.resizeTo(size.x, size.y); - thisWindow.resizeTo(size.x, size.y); - return; -} - -function BSSCPopupParentClicked() -{ - if (!window.gbPopupTimeoutExpired) { - return false; - } - - document.onmousedown = gbOrignalOnMouseDown; - - // Simply hide the popup - hideAll(); - - window.gbPopupTimeoutExpired = false; - - return true; -} - -function isInsideHyperLink(obj) -{ - if (obj&&obj!=getParentNode(obj)) - { - if (obj.tagName=="A"||obj.tagName=="IMG") - return true; - else - return isInsideHyperLink(getParentNode(obj)); - } - else - return false; -} - -function BSSCPopupClicked(e) -{ - if (!window.gbPopupTimeoutExpired) { - return false; - } - - var popupIFrame = getCurrentPopupIFrame(); - if (popupIFrame == null) { - return true; - } - - if (gbBsIE4 && (!((popupIFrame.window.event != null) && - (popupIFrame.window.event.srcElement != null) && - isInsideHyperLink(popupIFrame.window.event.srcElement)))) { - document.onmousedown = gbOrignalOnMouseDown; - - // Simply hide the popup - hideAll(); - window.gbPopupTimeoutExpired = false; - return true; - } - else if (gbBsNS6 && (!((e != null) && - (e.target!= null) && isInsideHyperLink(e.target)))) - { - document.addEventListener("mousedown", gbOrignalOnMouseDown,false); - // Simply hide the popup - hideAll(); - window.gbPopupTimeoutExpired = false; - return true; - } -} - -//trace the mouse over's position for hotspot -function BSPSPopupOnMouseOver(event) -{ - if (gbBsIE4 || gbBsOpera7||gbBsKonqueror3) { - window.gnPopupClickX = event.clientX + getScrollLeft(); - window.gnPopupClickY = event.clientY + getScrollTop(); - window.gnPopupScreenClickX = event.screenX; - window.gnPopupScreenClickY = event.screenY; - } else if (gbBsSafari) { - window.gnPopupClickX = event.clientX + getScrollLeft(); - window.gnPopupClickY = event.clientY + getScrollTop(); - window.gnPopupScreenClickX = event.screenX + window.screenX; - window.gnPopupScreenClickY = event.screenY + window.screenY; - } else if (gbBsNS4) { - window.gnPopupClickX = event.pageX - window.pageXOffset; - window.gnPopupClickY = event.pageY - window.pageYOffset; - window.gnPopupScreenClickX = event.screenX - window.pageXOffset; - window.gnPopupScreenClickY = event.screenY - window.pageYOffset; - } -} - -function BSSCHidePopupWindow() -{ - if (window.gPopupWindow != null) { - if (gbBsNS4) { - if ((typeof window.gPopupWindow != "undefined") && (!window.gPopupWindow.closed)) { - window.gPopupWindow.close(); - window.gPopupWindow = null; - } - } - } - return; -} - -// Add the PopupOnClick to the onclick array. -if (typeof(BsscRegisterOnClick) != "undefined") -{ - BsscRegisterOnClick(BsPopupOnClick); -} -//End to support previous popup functions - -/// Section End - Popup (JavaScript 1.0) - -/// Section Begin - Embedded Stub (JavaScript 1.0) - -function BSSCCreatePopupDiv() -{ - return; -} - -function WritePopupMenuLayer() -{ - if (BsscHasExtJs()) {_WritePopupMenuLayer();} -} - -function BSSCPopup(strURL, width, height) -{ - var re = new RegExp("'", 'g'); - strURL = strURL.replace(re, "%27"); - - if (BsscHasExtJs()) { - _BSSCPopup(strURL, width, height); - }else{ - //Create a temporary window first to ensure the real popup comes up on top - var wndTemp = null; - if (!gbBsNS3) { - wndTemp = window.open("", "temp", "titlebar=no,toolbar=no,status=no,location=no,menubar=no,resizable=yes,scrollbars=yes,height=3,width=4"); - } - // Create the real popup window - var wndPopup = window.open(strURL, "BSSCPopup", "titlebar=no,toolbar=no,status=no,location=no,menubar=no,resizable=yes,scrollbars=yes,height=300,width=400"); - // Close the temporary - if (!gbBsNS3) { - wndTemp.close(); - } else { - wndPopup.focus(); - } - } -} - -var gbWndTemp = null, gbWndPopupLinks = null; -var gbstrParaTotal = ""; - -function PopupMenu_Invoke() -{ - if (typeof(wfRelatedTopic) == 'function' && typeof(IsFlashSupported) == 'function') - { - if (Number(gsSkinVersion) > 2 && IsFlashSupported()) - { - return wfRelatedTopic(PopupMenu_Invoke.arguments); - } - } - if (BsscHasExtJs()) { - return _PopupMenu_Invoke(PopupMenu_Invoke.arguments); - } - if (gbBsNS3Before || gbBsIE3Before ) { - var argLen = PopupMenu_Invoke.arguments.length; - if (argLen < 5) { - window.document.location.href = PopupMenu_Invoke.arguments[3]; - return false; - } - gbWndTemp = null; - gbWndPopupLinks = null; - gbstrParaTotal = ""; - for (var i = 0; i < (argLen - 2) / 2; i++) { - var strParaLine = ""; - if (gbBsNS2){ - strParaLine += "" - strParaLine += PopupMenu_Invoke.arguments[2 * i + 2]; - strParaLine += ""; - } else { - strParaLine += ""); - if (gbBsNS2) { - gbWndPopupLinks.document.write(""); - } else { - //YJ: IE301,302 and NS3.x works fine - gbWndPopupLinks.document.write("<"); - gbWndPopupLinks.document.write("script>"); - gbWndPopupLinks.document.write("function gotoUrl(aUrl) {opener.window.location=aUrl; close();}"); - gbWndPopupLinks.document.write("<"); - gbWndPopupLinks.document.write("/script>"); - } - gbWndPopupLinks.document.write(""); - gbWndPopupLinks.document.write(gbstrParaTotal); - gbWndPopupLinks.document.write(""); - gbWndPopupLinks.document.close(); - - // Close the temporary - if (!gbBsNS3 && gbWndTemp != null) { - gbWndTemp.close(); - }else { - gbWndPopupLinks.focus(); - } - - return true; - } - return false; -} - -/// Section End - Embedded Stub (JavaScript 1.0) - -//// Segment End -- (JavaScript 1.0) - -//// Segment Begin -- (JavaScript 1.2) -/// Section Begin - kadov DHTM (JavaScript 1.2) - -//Begin to support extended and dropdown text effects. -function kadovIsParagraph(el) -{ - return( el.tagName == "P" || el.tagName.indexOf("H") == 0 ) ? true : false; -} - -function kadovInitEachChild(el) -{ - for(var i=0; i "") ) - child.style.setAttribute( "x-on-pageload", "" ); - } - - var href = child.getAttribute("href") - if( href != null && href > "" && href.indexOf( "BSSCPopup" ) >= 0 ) - kadovFilePopupInit(child.id); // Init for Popup - else if( child.className == "dropspot" || child.className == "expandspot" || - child.className == "glossterm" ) - kadovTextPopupInit(child.id);// Init for Expanding/Glossary or DropDown text - else if( child.className == "trigger") - kadovInitTrigger(child.id);// Init for Trigger - else - { - kadovInitEffects(child.id);// Init for DHTML effects - CEngine.SetOneTargetInitialState( child.id ); - } - } - - if( (child.tagName == "IMG") && (child.getAttribute("dynsrc") > "") ) - child.start = "mouseover";// to start a AVI file. fileopen doesn't work - - kadovInitEachChild(child); - } -} - -function kadovRetrieveTextInner(el) -{ - var x = ""; - if( (!el) || (el.tagName == "!") || (el.tagName == "SCRIPT" )) - return x; - - if( kadovIsParagraph(el) ) - { - var strNewID = " "; - if( el.id != "" ) - strNewID += "id=" + el.id + "_NewSpan "; - x = "" + el.innerHTML + ""; - } - else - { - for(var i=0; i 0 ) - if( (nTagClose - nTagOpen) != nDistance ) - return strRawHTML; - - var strCleanOnce = strRawHTML.substring(0, nTagOpen) + strRawHTML.substr(nTagClose + strTagClose.length) ; - return kadovRetrieveCleanHTML( strCleanOnce, strTagOpen, strTagClose ); -} - -function kadovAdjustObjectTag(strRawHTML, nStartPos) -{// adjust object tag for related topics HTML control, because innerHTML misses out the item settings - - //Is there any DTC? - var strDTCTagOpen = ''; - var nDTCTagOpen = strRawHTML.indexOf( strDTCTagOpen, nStartPos ); - if( nDTCTagOpen < 0 ) - return strRawHTML; - var nDTCTagClose = strRawHTML.indexOf( strDTCTagClose, nDTCTagOpen ); - if( nDTCTagClose < nDTCTagOpen) - return strRawHTML; // no Design Time Controls; - - //Is the DTC HTML Help Control? - var strRTObjTagOpen = 'classid=clsid:ADB880A6-D8FF-11CF-9377-00AA003B7A11'; - var strRTObjTagClose = ''; - var nRTObjTagOpen = strRawHTML.indexOf( strRTObjTagOpen, nDTCTagOpen ); - if( nRTObjTagOpen < nDTCTagOpen ) - return strRawHTML; - var nRTObjTagClose = strRawHTML.indexOf( strRTObjTagClose, nRTObjTagOpen ); - if( nRTObjTagClose < nRTObjTagOpen ) - return strRawHTML; // is not a HTML help control - - // Is it a related Topics html help control? - var strRTObjLabel = ''; - } - - // to insert the reconstructed item params into runtime object tag - var strAdjustedHTML = strRawHTML.substring(0,nRTObjTagClose) + strRunTimeItemParam + strRawHTML.substring(nRTObjTagClose, strRawHTML.length); - return kadovAdjustObjectTag(strAdjustedHTML, nDTCTagClose + strDTCTagClose.length); -} - -function kadovTextPopupOnLoad( el ) -{ - if( typeof(el) == "string" ) - el = getElement(el); - - var src = el.getAttribute( "x-use-popup" ); - var bNeedMove=true; - if(!src&&el.id) - { - for (var i=0;i"); - strCleanHTML = kadovRetrieveCleanHTML(strCleanHTML, ""); - - //work around the bug in HH.exe that highlight the phrases when use Search tab - //this approach is just removing the tag inserted by Microsoft in the runtime - strCleanHTML = kadovRetrieveCleanHTML(strCleanHTML, "", 52); - - var strStyle = " style='display:none; position:relative;"; - var newDiv = "
" + strCleanHTML + "
"; - - removeThis(srcDiv); // empty the original DIV tag - var elParentPra = kadovFindParentParagraph(el); - if( elParentPra ) - insertAdjacentHTML(elParentPra, "afterEnd", newDiv ); - } - else if( type == "expanding" ) - { - var inner = kadovRetrieveTextInner(srcDiv); - if( inner == "" ) - inner = srcDiv.innerHTML; - var strAdjust = kadovAdjustObjectTag(inner,0); - var strCleanHTML = kadovRetrieveCleanHTML(strAdjust, ""); - strCleanHTML = kadovRetrieveCleanHTML(strCleanHTML, ""); - var strClassName = (el.className == "glossterm") ? "glosstext" : "expandtext"; - var newSpan = ""; - removeThis(srcDiv); // empty the original DIV tag - insertAdjacentHTML(el, "afterEnd", newSpan ); - } - } - } - else - { - srcDiv.style.display = "none"; - } - return 0; -} - -function getElementsByTag(obj,sTagName) -{ - if(obj.getElementsByTagName) - return obj.getElementsByTagName(sTagName); - else if(obj.all) - return obj.all.tags(sTagName); - return null; -} - -function getElement(sID) -{ - if(document.getElementById) - return document.getElementById(sID); - else if(document.all) - return document.all(sID); - return null; -} - -function getParentNode(obj) -{ - if(obj.parentNode) - return obj.parentNode; - else if(obj.parentElement) - return obj.parentElement; - return null; -} - -function getChildNodes(obj) -{ - if(obj.childNodes) - { - var children = new Array(); - for (var i = 0; i < obj.childNodes.length; i++) - { - if (obj.childNodes[i].nodeType == 1) - children[children.length] = obj.childNodes[i]; - } - return children; - } - else if(obj.children) - return obj.children; - return null; -} - -function removeThis(obj) -{ - if(obj.parentNode) - obj.parentNode.removeChild(obj); - else - obj.outerHTML=""; -} - -function kadovTextPopup( el ) -{ - if (!gbBsIE4 && !gbBsOpera7 && !gbBsSafari && !gbBsNS6 && !gbBsKonqueror3 ) - return; - - var bNeedMove=true; - - if (window.event) - window.event.cancelBubble = true; - - if( typeof(el) == "string" ) - el = getElement(el); - - if (!el||el==window) - return; - - var src = el.getAttribute( "x-use-popup" ); - if(!src&&el.id) - { - for (var i=0;i= 0 && nNext < values.length ) - { - functions[nIdx] = values.substr( nStart, nNext-nStart+1); - nStart = nNext + 1; - nIdx++; - nNext = values.indexOf( "\)", nStart); - } - - for( var i=0; i= 0 ) - { - nPageClick = arrForClickCount[j].indexOf("="); - if( nPageClick > 0 ) - { - nClickTimes = arrForClickCount[j].substring( nPageClick + 1, arrForClickCount[j].length) * 1; - break; - } - } - } - var args = srcargs; - if( j < arrForClickCount.length ) - {// to strip out the "clicks=99" from the arguments string - args = ""; - for( var k = 0; k < arrForClickCount.length; k ++ ) - { - if( k != j ) - { - args += arrForClickCount[k]; - if( k < arrForClickCount.length - 1 ) - args += ","; - } - } - } - bsscFXInit( null, id, translatedProp, fnname, args, nClickTimes ); - } -} - -function kadovTranslateProp( prop ) -{ - switch( prop ) - { - case "x-on-hover" : return "bsschover"; - case "x-on-pageclick" : return "bsscpageclick"; - case "x-on-pageload" : return "bsscpageload"; - case "x-on-trigger-1" : return "bssctrigger1"; - case "x-on-trigger-2" : return "bssctrigger2"; - } - return null; -} -//End to convert iWrite format to RoboEditor Format for DHTML effects - -//Begin the definition of one entry to DHTML effects -function bsscFXInit( trigger_ID, target_ID, event_type, - action_type, action_setting, event_addional ) -{ - if( (!gbBsWindows && !gbBsSunOS && !(gbBsMac&&gbBsIE5)) || typeof(target_ID) != "string" )//MUST have a target_ID - return; // we don't support Navigator yet - - if( typeof(event_type) == "string" ) - event_type = event_type.toLowerCase(); - if( typeof(action_type) == "string" ) - action_type = action_type.toLowerCase(); - if( typeof(action_setting) == "string" ) - action_setting = action_setting.toLowerCase(); - - // to get the target element then add it to the target list - var eleTarget = CCSSP.GetObject( target_ID ); - if( (eleTarget != null) && (event_type != null) && (action_type != null) ) - { - CEngine.AddOneTarget( target_ID, eleTarget ); - CEngine.BuildTargetObject(target_ID, event_type, action_type, action_setting, event_addional); - } - - // to validate the trigger_ID parameter - if( typeof(trigger_ID) == "string" && trigger_ID != "" ) - CEngine.BuildTriggerObject( trigger_ID, target_ID ); -} -//End the definition of one entry to DHTML effects - -/// Section End - kadov DHTM (JavaScript 1.2) - -/// Section Begin - CCSSP DHTM (JavaScript 1.2) - -//Begin JavaScript libary for cross-platform positioning object. -function CCSSP(){} // constructor of CCSSP class - -CCSSP.GetObject = function( obj ) -{//convert object name string or reference into a valid object reference - if( typeof(obj) == "object" ) - return obj; - else if( typeof(obj) == "string" && obj != "") - { - if( gbBsNS4 ) - return eval("document." + obj); - else - return eval("document.all(\"" + obj + "\")"); - } - else - return null; -} - -CCSSP.MoveObjectTo = function(obj, x, y) -{//positioning an object at a specific pixel coordinate - if( gbBsNS4 ) - obj.moveTo(x,y); - else - { - obj.style.pixelLeft = x; - obj.style.pixelTop = y; - } -} - -CCSSP.MoveObjectBy = function(obj, dx, dy) -{//moveing a object by x and/or y pixel - if( gbBsNS4 ) - obj.moveBy(dx,dy); - else - { - obj.style.pixelLeft += dx; - obj.style.pixelTop += dy; - } -} - -CCSSP.SetObjectBGColor = function(obj, color) -{//set the background color of an object - if( gbBsNS4 ) - obj.bgColor = color; - else - obj.style.backgroundColor = color; -} - -CCSSP.ShowObject = function(obj, bShow) -{// set the object to be visible or invisible - if( gbBsNS4 ) - obj.visibility = (bShow == true) ? 'show' : 'hide'; - else - obj.style.visibility = (bShow == true) ? 'visible' : 'hidden';// when hidden, it still occupy some space. -} - -CCSSP.GetObjectLeft = function(obj) -{// retrieve the x coordinate of a posionable object - if( gbBsNS4 ) - return obj.left; - else - return obj.style.pixelLeft; -} - -CCSSP.GetObjectTop = function(obj) -{// retrieve the y coordinate of a posionable object - if( gbBsNS4 ) - return obj.top; - else - return obj.style.pixelTop; -} - -CCSSP.GetObjectContainLeft = function(obj) -{// retrieve the x coordinate of a posionable object relative to it's parent element - if( gbBsNS4 ) - return obj.pageX; - else - { - if( obj == document.body ) - return obj.clientLeft; - else - return obj.offsetLeft; - } -} - -CCSSP.GetObjectWindowLeft = function(obj) -{// retrieve the x coordinate of a posionable object relative to browser window - if( gbBsNS4 ) - return obj.pageX; - else - { - var nOffsetWindowLeft = 0; - for(var element = obj; element; element = element.offsetParent) - nOffsetWindowLeft += CCSSP.GetObjectContainLeft(element); - return nOffsetWindowLeft; - } -} - -CCSSP.GetObjectContainTop = function(obj) -{// retrieve the y coordinate of a posionable object relative to it's parent element - if( gbBsNS4 ) - return obj.pageY; - else - { - if( obj == document.body ) - return obj.clientTop; - else - return obj.offsetTop; - } -} - -CCSSP.GetObjectWindowTop = function(obj) -{// retrieve the y coordinate of a posionable object relative to browser window - if( gbBsNS4 ) - return obj.pageY; - else - { - var nOffsetWindowTop = 0; - for(var element = obj; element; element = element.offsetParent) - nOffsetWindowTop += CCSSP.GetObjectContainTop(element); - return nOffsetWindowTop; - } -} - -CCSSP.GetObjectHeight = function(obj) -{// retrieve the height of a posionable object - if( gbBsNS4 ) - return obj.clip.height; - else - return obj.offsetHeight; -} - -CCSSP.GetObjectWidth = function(obj) -{// retrieve the width of a posionable object - if( gbBsNS4 ) - return obj.clip.width; - else - return obj.offsetWidth; -} - -CCSSP.RegisterEventHandler = function( srcObj, rawEventName, funcHandler ) -{ // to add the "funcHandler" as the "rawEventName" 's handler to the "srcObj" object,the original event handler will be combined - if (gbBsNS4 && !gbBsNS6) - return ; - - var oldHandler = ""; - - if (gbBsMac &&gbBsIE4&&!gbBsIE5) - { - if (typeof(srcObj[rawEventName.toLowerCase()])=="unknown") - { //search for - - - - - - - - -

Introduction to GEOM

- -

GEOM module of - SALOME is destined for:

- -

 

- -
    - -

  • Import and export of geometrical models in IGES, - BREP and STEP formats.

    • - -

  • Construction and optimization of geometrical models - using a wide range of  CAD - functions:

    • -
- -

 

- - --- - - - -
-
    - -

  • Creation of basic geometrical objects

    • - -

  • Construction of primitives

    • - -

  • Building shapes

    • - -

  • Generation of complex shapes

    • - -

  • Working with groups

    • - -

  • Geometrical repairing of objects

    • - -

  • Geometrical boolean operations

    • - -

  • Geometrical transformations

    • - -

  • Building by blocks

    • - -

  • Generation of complex objects

    • -
-

 

 -

- -

 

- - - - + + + + + +Introduction to GEOM + + + + + + + + + + + + +

Introduction to Geometry

+ +

Geometry module + of SALOME is destined for:

+ +

 

+ +
    + +

  • Import and export of geometrical models in IGES, + BREP and STEP formats.

    • + +

  • Construction and optimization of geometrical models + using a wide range of  CAD + functions:

    • +
+ +

 

+ + +++ + + + +
+
    + +

  • Creation of basic geometrical objects

    • + +

  • Construction of primitives

    • + +

  • Building shapes

    • + +

  • Generation of complex shapes

    • + +

  • Working with groups

    • + +

  • Geometrical repairing of objects

    • + +

  • Geometrical boolean operations

    • + +

  • Geometrical transformations

    • + +

  • Building by blocks

    • +
+

 

 +

+ +

 

+ + + + diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm deleted file mode 100755 index 1630c691f..000000000 --- a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions.htm +++ /dev/null @@ -1,885 +0,0 @@ - - - - - -Titre - - - - - - - - - - - - - - -

In GEOM you can create basic geometrical objects (1D - & 2D elements) such as:

- -

- - - - - - -

 

- -

 

- -

To create basic geometrical objects:

- -

 

- -

In the main menu select New - Entity > Basic.

- -

 

- -  - -

Point

- -

 

- -

Description: - Creates a point.

- -

 

- -

Result: GEOM_Object - (vertex).

- -

 

- -

TUI Command : -   geompy.MakeVertex(X, - Y, Z) -

- -

geompy.MakeVertexWithRef(Reference, - X, Y, Z)

- -

geompy.MakeVertexOnCurve(Edge, Parameter) -

- -

 

- -

Arguments:

- -
    - -

  • 1st - Constructor: Name + X, Y and Z coordinates of the point.

    • - -

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

    • - -

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

    • -
- -

 

- -

Dialog Box:

- -

 

- - ---- - - - - -
-

 -

 -

- -

 

- -

 

- -

   

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

Line

- -

 

- -

Description: - Creates a line.

- -

 

- -

Result: GEOM_Object - (edge).

- -

 

- -

TUI Command: - geompy.MakeLine(Point1, Point2), - where Point1 and Point2 are points through  which - the line passes.

- -

 

- -

Arguments: - Name + 2 vertices.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

Circle

- -

 

- -

Description: - Creates a circle.

- -

 

- -

Result: GEOM_Object - (edge).

- -

 

- -

TUI Command: - geompy.MakeCircle(Point, Vector, Radius), - where Point defines the center of the circle, Vector gives the circleÂ’s - normal and Radius is the circleÂ’s  radius.

- -

 

- -

Arguments: -

- -
    - -

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

    • - -

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

    • -
- -

 

- -

 

- -

 

- -

Dialog Box:

- -

 

- - --- - - - -
-

 -

- -

 

- -

 

- -

 

- -

 

- -

Example:

- -

 

- -

- -

 

- -

Ellipse

- -

 

- -

Description: - Creates an ellipse.

- -

 

- -

Result: GEOM_Object - (edge).

- -

 

- -

TUI Command: geompy.MakeEllipse(Point, Vector, RadiusMajor, - RadiusMinor), where Point defines the center of the ellipse, Vector - gives the ellipseÂ’s normal, RadiusMajor and RadiusMinor  are - correspondingly a major and minor radiuses of the ellipse.

- -

 

- -

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

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

Arc

- -

 

- -

Description: - Creates an arc.

- -

 

- -

Result: GEOM_Object - (edge).

- -

 

- -

TUI Command: - geompy.MakeArc(Point1, Point2, Point3), - where Point1 is the starting point of the arc, Point2 is a middle point - of the arc and Point3 is the ending point of the arc.

- -

 

- -

Arguments: - Name + 3 vertices.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

Curve

- -

 

- -

Description: - Creates a curve in 3D space.

- -

 

- -

Result: - GEOM_Object (edge).

- -

 

- -

TUI Command: -

- -
    - -

  • geompy.MakePolyline(ListOfShapes), - where ListOfShape is a list of points through which the curve passes .

    • - -

  • geompy.MakeInterpol(ListOfShapes), - where ListOfShape is a list of points through which the curve passes .

    • - -

  • geompy.MakeBezier(ListOfShapes), - where ListOfShape is a list of points through which the curve passes .

    • -
- -

 

- -

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

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

Polyline -                                          Bezier -                                      B-Spline

- -

          

- -

 

- -

 

- -

Vector

- -

 

- -

Description: - Creates a vector.

- -

 

- -

Result: GEOM_Object - (edge).

- -

 

- -

TUI Command: - geompy.MakeVector(Point1, Point2), - where Point1 is the first point of the vector and the Point2 is the last - point of the vector.

- -

 

- -

Arguments :

- -
    - -

  • 1st - Constructor : Name + 2 vertices.

    • - -

  • 2nd - Constructor : Name + 3 values (Coordinates of the 2nd vertex. The - first vertex is in the origin).

    • -
- -

 

- -

Dialog Box:

- -

 

- -

      

- -

 

- -

Example:

- -

 

- -

- -

 

- -

Plane

- -

 

- -

Description: - Creates a plane.

- -

 

- -

Result: GEOM_Object - (face).

- -

 

- -

TUI Command: - geompy.MakePlane(Point, Vector, TrimSize), - where Point is a point through which  the - plane passes, Vector gives a normal of the plane and TrimSize is a half - size of a side of quadrangle face, representing the plane.

- -

 

- -

Arguments:

- -
    - -

  • 1st - Constructor : Name + 1 vertex + 1 vector  + - 1 value (to define the size of the plane).

    • - -

  • 2nd - Constructor : Name + 1 vertex + 3 points (for the direction) + 1 value - (to define the size of the plane).

    • - -

  • 3rd - Constructor : Name + 1 selection + 1 value (to define the size of - the plane).

    • -
- -

 

- -

Dialog Box:

- -

 

- - ---- - - - - -
-

 -

 -

- -

 

- -

 

- -

         

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

Working - Plane

- -

 

- -

Description: - Sets the working plane (and the camera position).

- -

 

- -

Arguments: -

- -
    - -

  • Name + 1 selection (face - or planar face),

    • - -

  • Name +  2 - vectors,

    • - -

  • Name + XYZ coordinate - system

    • -
- -

 

- -

 

- -

Dialog Box:

- -

 

- - ---- - - - - -
-

 -

 -

- -

 

- -

 

- -

 

- -

 

- -

 

- -

Local - coordinate system

- -

 

- -

Description: -  The user - may manually enter values of X, Y, and Z coordinates of origin in the - corresponding fields of the dialog box, or select a point in the object - browser or 3D viewer, in this case coordinates of origin are automatically - filled in with the coordinates of the selected point.

- -

The user then specifies components of X and - Y axes direction.

- -

Preview of the new LCS (small trihedron located - and oriented according to parameters of LCS) is displayed in the 3D viewer - and updated as soon as the user modifies some parameter.

- -

Then the user presses «OK» or «Apply» button - to create an LCS at the location with the specified coordinates. The new - object is shown in the Object Browser and in 3D viewer.

- -

 

- -

 

- -

TUI command: - geompy.MakeMarker(OX, OY, OZ, XDX, XDY, - XDZ, YDX, YDY, YDZ), where OX, OY, OZ are coordinates of the origin - of LCS, XDX, XDY, XDZ is a vector of OX  direction - of the LCS and YDX, YDY, YDZ is a a vector of OY direction of the LCS.

- -

 

- -

 

- -

Arguments: -

- -
    - -

  • 1st - Constructor : Name + Coordinates of origin, X axis direction, Y axis - direction

    • - -

  • 2nd - Constructor : Name + reference object.

    • - -

  • 3rd - Constructor : Name + 1 point of origin + X axis direction, Y axis - direction.

    • -
- -

 

- -

.

- -

 

- -

Dialog Box:

- -

 

- - ---- - - - - -
-

 -

 -

- -

 

- -

Example:

- -

 

- -

- - - - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image28.gif b/doc/salome/gui/GEOM/files/salome2_sp3_basicgui_functions_salome2_sp3_basicgui_functions_image28.gif deleted file mode 100755 index 0667288b69cbf0bee91f3b101cf2d87c2e3bd751..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 904 zcmZ?wbhEHb6k!ly_|5(lNgTy1P62||G85StHbn?j7 zUGexN&(Ov1Y4)W;@Ud670yoo)lSa=D%~CBEbD3G3=H9Iu-*-i0OX{&jX1q#QITBVL TW3q2gbI}Y{_M6Md$Y2csO0_n= 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 c290d8bf3..17ad1ddd5 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_booleangui_functions.htm @@ -1,153 +1,159 @@ - - - - - -Titre - - - - - - - - - - - - -

Using boolean operations

- -

 

- -

In GEOM for construction of more complex geometrical objects - (2D & 3D elements) you can use the following boolean operations:

- -

 

- - - - - -

 

- -

There is a general TUI command covering - all these operations, which can be used alongside with separate commands - for each operation.

- -

geompy.MakeBoolean(Shape1, - Shape2, Operation), where Shape1 is the first argument and Shape2 - is the second argument of Boolean operation, Operation is a type of the - Boolean operation (1 – Common, 2 – Cut, 3 – Fuse, 4 – Section).

- -

 

- -

Our TUI - Scripts provide you with useful examples of the use of Boolean - Operations.

- -

 

- - - - + + + + + +Titre + + + + + + + + + + + + + +

Using boolean operations

+ +

 

+ +

You can use the following + boolean operations for construction of more complex geometrical objects + (2D & 3D elements) :

+ +

 

+ + + + + +

 

+ +

There is a general TUI command covering + all these operations, which can be used alongside with separate commands + for each operation.

+ +

geompy.MakeBoolean(Shape1, + Shape2, Operation), where Shape1 is the first argument and Shape2 + is the second argument of Boolean operation, Operation is a type of the + Boolean operation (1 – Common, 2 – Cut, 3 – Fuse, 4 – Section).

+ +

 

+ +

Our TUI + Scripts provide you with useful examples of the use of Boolean + Operations.

+ +

 

+ + + + diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_buildgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_buildgui_functions.htm deleted file mode 100755 index 42c0ee8ea..000000000 --- a/doc/salome/gui/GEOM/files/salome2_sp3_buildgui_functions.htm +++ /dev/null @@ -1,458 +0,0 @@ - - - - - -Titre - - - - - - - - - - - -

Building geometrical objects

- -

In GEOM you can create basic and advanced geometrical objects - (2D & 3D elements) using the following building functions:

- -

 

- - - -

 

- -

 

- -

 

- -

To use Explode:

- -

 

- -

In the main menu select New - Entity > Explode.

- -

 

- -

Explode

- -

 

- -

Description: - Returns a list of subshapes (vertices, edges, wires etc.) of the given - shape.

- -

 

- -

Result : - List of GEOM_Objects.

- -

 

- -

TUI Command: -

- -
    - -

  • geompy.SubShape(Shape, - ListOfID), where Shape is a shape whose subshape(s) is (are) retrieved, - ListOfID is a list of requested sub shapes IDs. To get a subshape ID use - method GetSubShapeID().

    • - -

  • geompy.SubShapeAll(Shape, - TypeOfShape), where Shape is a shape to be exploded on sub shapes - of type TypeOfShape.

    • -
- -

 

- -

Arguments: - 1 SHAPE + 1 type of SubShape.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

To use building functions:

- -

 

- -

In the main menu select - New Entity > Build - submenu.

- -

 

- -

Edge

- -

 

- -

Description: - Creates an edge.

- -

 

- -

Result: GEOM_Object - (EDGE).

- -

 

- -

TUI Command: - geompy.MakeEdge(Vertex1, Vertex2), - where Vertex1 and Vertex2 are correspondingly the first and the last vertex - of the edge.

- -

 

- -

Arguments: - Name + 2 vertices.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

- -

 

- -

Wire

- -

 

- -

Description: - Creates a wire.

- -

 

- -

Result: GEOM_Object - (WIRE).

- -

 

- -

TUI Command : - geompy.MakeWire(ListOfShape), - where ListOfShape is a list of edges and/or wires from which the wire - to be constructed.

- -

 

- -

Arguments: - Name + List of connected wires or edges..

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

- -

 

- -

Face

- -

 

- -

Description: - Creates a face.

- -

 

- -

Result: GEOM_Object - (FACE).

- -

 

- -

TUI Command: - geompy.MakeFace(Wire, WantPlanarFace), - where Wire is a wire and if boolean parameter WantPlanarFace is planar - then only a planar face or no face is constructed.

- -

 

- -

Arguments: - Name + 1 wire.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

- -

 

- -

Shell

- -

 

- -

Description: - Creates a shell.

- -

 

- -

Result: GEOM_Object - (SHELL).

- -

 

- -

TUI Command: - geompy.MakeShell(ListOfShape), - where ListOfShape is a list of faces and (or) shells from which the shell - is constructed.

- -

 

- -

Arguments: - Name + List of faces having connected edges.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

- -

 

- -

Solid

- -

 

- -

Description: - Creates a solid - closed geometrical 3D element.

- -

 

- -

Result: GEOM_Object - (SOLID).

- -

 

- -

TUI Command: - geompy.MakeSolid(ListOfShape), - where ListOfShape is a list of shells from which the solid is constructed.

- -

 

- -

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

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

Compound

- -

 

- -

Description: - Creates a compound.

- -

 

- -

Result: GEOM_Object - (COMPOUND).

- -

 

- -

TUI Command: - geompy.MakeCompound(ListOfShape), - where ListOfShape is a list of shapes from which the compound is constructed.

- -

 

- -

Arguments: - Name + List of shapes.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

 

- - - - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions.htm deleted file mode 100755 index ff0ba882b..000000000 --- a/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions.htm +++ /dev/null @@ -1,225 +0,0 @@ - - - - - -Titre - - - - - - - - - - - -

Displaying/hiding objects

- -

Visualization is available in both viewers, OCC and VTK - . 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.

- -

 

- -

Displaying\hiding - different geometrical objects in the viewer is possible using the following - operations:

- -

 

- - - -

 

- -

To display\hide one or several objects in the viewer:

- -

 

- -

In the main menu select View - or right-click on the necessary object in the Object Browser and - from the associated pop-up menu choose the required operation.

- -

 

- -

 

- -

DisplayAll -

- -

 

- -

Description: - Displays all geometrical objects which have been created or imported in - the current study.

- -

 

- -

TUI - Command: sg.DisplayAll()

- -

 

- -

 

- -

EraseAll

- -

 

- -

Description: - Erases all shapes displayed in the viewer.

- -

 

- -

TUI - Command: sg.EraseAll()

- -

 

- -

 

- -

Display

- -

 

- -

Description: - Displays an object in 3D viewer.

- -

 

- -

TUI - Command:

- -

 

- -

 

- -

DisplayOnly

- -

 

- -

Description: - Displays only the selected geometrical element.

- -

 

- -

TUI - Command: sg.DisplayOnly(ID)

- -

 

- -

 

- -

Erase

- -

 

- -

Description - : Erases only the selected shape.

- -

 

- -

TUI - Command : sg.EraseOnly(ID)

- -

 

- -

 

- - - - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image51.gif b/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image51.gif deleted file mode 100755 index 83388cc3d2f2ed2d18e837c5036474f8d0c611aa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 946 zcmZ?wbhEHb6k!ly_|5gdEz_<+l#G(2 zAu#+xfRTYw@h1x-1H*p?9gy!pdBTCCpW#2JjK_ur2OAmqm;x9Q92%L~1sP^|Y<$ST z#3mr&Q}IE*ftgc8OTb~%5{5QDMXfa!8%XM_|+^D z7BmDdW^>pT^J>y!Ulzsibu|)G7X;6C2#pdwA(Vctm%Fygcjw0?5sdNGU0Wr#Jh;Hb Y!ggY+cf+dFEF63DqN`w{F_Hch}yQY1fV%IRcg+B}PMF z*oJ`OPZqG>bU-91PdIQ)W)S9(@z}87AOjPlfdc|=Sc7A!o>z{IAK!LeZR z@qPvwF^L5e79MVwG@o}z;^TpXE!@ecSPU8(jG`KVvmVg zJO{R{3|`2(P>3hs^Rp{+jFOo$EGIlZv^-(=vnjW>K66{9dUDYlPs6uf^H|+i-SsGW V;J?BDwV#T?g7xwHS(um@tN|h@RNMdn diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image54.gif b/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image54.gif deleted file mode 100755 index 5bed6049e63531ef48cf5b7edb4b72d8fa2acce8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 994 zcmZ?wbh9u|6k!ly_|5DqN`w{F_H zch}yQY1a-MIB?|1kz>b?{r?ZtF$zXQU^s+;;!hT^H*`QGC{H+W>}QbYknspmXkg>z zQMn(o}0Ne&^DF6Tf diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image55.gif b/doc/salome/gui/GEOM/files/salome2_sp3_displaygui_functions_salome2_sp3_displaygui_functions_image55.gif deleted file mode 100755 index 4890bda6c1cb65cd1262ceba43e392b484df9506..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 987 zcmZ?wbh9u|6k!ly_|5)u^^o2OlB znRe~Skt4^BAN&6wsCE>LhQRO%0mYvzV9)4)NKl?|;Ml<+%^~AapuoV!!>5+RkZ_QR ziAkEN;K2e1=XM4G6^$7W4!E`}7>XGjxS-fLS)I`)f>WUZsGCE{fMH|Gi3tpDxAt@z zIxw^{upQYGG5O)CsiKTBHzY2m1kY3QGz*x(@YH>tqEH&+j{$`QShtgX#KpS8pyzPFfMjeJ-SD Y@<)eNsm9UIDh@O}KR=(Jg@wTy0I>FIp8x;= diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions.htm deleted file mode 100755 index 322971bfa..000000000 --- a/doc/salome/gui/GEOM/files/salome2_sp3_generationgui_functions.htm +++ /dev/null @@ -1,307 +0,0 @@ - - - - - -Titre - - - - - - - - - - - -

Generating complex objects

- -

Generation operations in GEOM are used to create advanced - geometrical objects (3D elements). They are:

- -

 

- - - -

 

- -

To use generation operations:

- -

 

- -

In the main menu select New - Entity > Generation.

- -

 

- -

Extrusion

- -

Description: - Creates an extruded shape.

- -

 

- -

Result: GEOM_Object - (edge, face, solid or compsolid).

- -

 

- -

TUI Command : - geompy.MakePrism(baseShape, Vector, - Height), where baseShape is a basis of the prism, Vector is a normal - of the prism and Height is a height of the prism.

- -

 

- -

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

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

Revolution

- -

- -

Description: - Creates an extruded shape by revolution.

- -

 

- -

Result: GEOM_Object - (edge, face, solid or compsolid).

- -

 

- -

TUI Command: - geompy.MakeRevolution(Shape, Axis, - Angle), where Shape is a shape to rotate, Axis is the axis of the - revolution and Angle is an angle by which Shape has to be rotated around - Axis.

- -

 

- -

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

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

Filling

- -

 

- -

Description: - Creates a curving face using several curves.

- -

 

- -

Result: GEOM_Object - (face).

- -

 

- -

TUI Command: - geompy.MakeFilling(Shape, MinDegree, - MaxDegree, Tol2D, Tol3D, NbIter), where Shape is a shape to fill, - MinDegree and MaxDegree are correspondingly maximal and minimal degree, - Tol2D is a tolerance for 2D and Tol3D is a tolerance for 3D, NbIter is - a number of iterations.

- -

 

- -

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

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

Pipe

- -

- -

Description: - Creates an extruded shape.

- -

 

- -

Result: GEOM_Object - (edge, face, solid or compsolid).

- -

 

- -

TUI Command: - geompy.MakePipe(baseShape, pathShape), - where baseShape is a shape to be extruded, pathShape is a path along which - baseShape is extruded.

- -

 

- -

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.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

 

- -

 

- - - - 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 566fc05e7..0f044a2a9 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_geomtoolsgui_functions.htm @@ -1,141 +1,146 @@ - - - - - -Titre - - - - - - - - - - - -

Importing/exporting geometrical objects

- -

In GEOM you can import - and export geometrical objects from/into BREP, IGES, STEP files. The mechanisms of import and export - are implemented via plug-ins, which gives you the opportunity to expand - the range of available formats by adding more plug-ins (for example, CATIA - 5).  

- -  - -

To import geometrical objects from a BREP, IGES, STEP file:

- -

 

- -

From the File - menu choose Import. In - the opening dialog box Import - select the required format of the file for importation and search for - a *.brep, *.iges or *.step  file. -

- -

 

- -

- -

 

- -

Select the required file and click Open. Your file will be imported into - GEOM and its contents (geometrical object) will be displayed in the Object Browser.

- -

 

- -

 

- -

To export geometrical objects into a BREP, IGES, STEP file:

- -

 

- -

Select the object you wish to export, then - from the File menu choose Export. In the opening dialog box Export define the required format the - name and the location of the file for exportation. -

- -

 

- -

- -

 

- -

Click Save - to confirm your exportation.  

- - - - + + + + + +Titre + + + + + + + + + + + + +

Importing/exporting geometrical objects

+ +

In Geometry module you + can import and export geometrical objects from/into BREP, IGES, STEP files. The mechanisms of import and export + are implemented via plug-ins, which gives you the opportunity to expand + the range of available formats by adding more plug-ins (for example, CATIA + 5).  

+ +  + +

To import geometrical objects from a BREP, IGES, STEP file:

+ +

 

+ +

From the File + menu choose Import. In + the opening dialog box Import + select the required format of the file for importation and search for + a *.brep, *.iges or *.step  file. +

+ +

 

+ +

+ +

 

+ +

Select the required file and click Open. Your file will be imported in + the module and its contents (geometrical object) will be displayed in + the Object Browser.

+ +

 

+ +

 

+ +

To export geometrical objects into a BREP, IGES, STEP file:

+ +

 

+ +

Select the object you wish to export, then + from the File menu choose Export. In the opening dialog box Export define the required format, + the name and the location of the file for exportation. +

+ +

 

+ +

+ +

 

+ +

Click Save + to confirm your exportation.  

+ + + + 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 0740b8917..d854bcf3c 100755 --- a/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm +++ b/doc/salome/gui/GEOM/files/salome2_sp3_measuregui_functions.htm @@ -1,595 +1,509 @@ - - - - - -Titre - - - - - - - - - - - - -

Using measurement tools

- -

Measurement tools in GEOM are necessary for getting different - data concerning created or imported geometrical objects. They are:

- -

 

- - - -

 

- -

Our TUI Scripts - show how to use Measurement Tools - with  TUI - commands.

- -

 

- -

To use measurement tools:

- -

 

- -

In the main menu select Measures - submenu.

- -

 

- -

 

- -

  Point coordinates

- -

 

- -

Description: - Returns the coordinates of a point.

- -

 

- -

Result: Point - coordinates (X, Y, Z) in 3D space in the form of Python Tuple.

- -

 

- -

TUI command: - geompy.PointCoordinates(Point), - where Point is a point whose coordinates are inquired.

- -

 

- -

 

- -

Arguments: - 1 point.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

Basic properties -

- -

 

- -

Description: - Return the properties (Length, Surface & Volume) of a definite geometrical - object.

- -

 

- -

Result: Display - Length, Surface & Volume in the form of Python Tuple.

- -

 

- -

TUI command: - geompy.BasicProperties(Shape), - where Shape is a shape whose properties are inquired.

- -

 

- -

Arguments: - 1 shape.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

- Center of mass

- -

 

- -

Description: - Creates a gravity center of a shape and returns its coordinates.

- -

 

- -

Result: GEOM_Object - (vertex).

- -

 

- -

TUI Command: - geompy.MakeCDG(Shape), where - Shape is the shape for which a center of gravity is computed.

- -

 

- -

Arguments: - 1 shape.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

Inertia -

- -

 

- -

Description: - Returns the inertia axis of a geometrical object.

- -

 

- -

Result: Display - the matrix and moments of inertia in the form of Python Tuple (I11, I12, - I13,

- -

 I21, - I22, I23,

- -

 I31, - I32, I33,

- -

 Ix, - Iy, Iz).

- -

 

- -

TUI command: - geompy.Inertia(Shape), where - Shape is a shape for which a matrix of inertia and moment of inertia are - returned.

- -

 

- -

Arguments: - 1 shape.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

Bounding - box

- -

 

- -

Description: - Returns the dimensions of the bounding box of a geometrical object.

- -

 

- -

Result: Displays - the dimensions of the bounding box of a geometrical object in the form - of Python Tuple (Xmin, Xmax, Ymin, Ymax, Zmin, Zmax).

- -

 

- -

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

- -

 

- -

Arguments: - 1 shape.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

Min. distance

- -

 

- -

Description: - Returns the min. distance between 2 geometrical objects.

- -

 

- -

Result: Displays - the min. distance.

- -

 

- -

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

- -

 

- -

Arguments: - 2 shapes.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

- Tolerance

- -

 

- -

Description: - Returns the tolerance of a geometrical object.

- -

 

- -

Result: Displays - the tolerance values (FaceMinTol, FaceMaxTol, EgdeMinTol, EgdeMaxTol, - VertexMinTol, VertexMaxTol).

- -

 

- -

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

- -

 

- -

Arguments: - 1 shape.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

WhatIs -

- -

 

- -

Description: - Returns the type of a geometrical object.

- -

 

- -

Result: Displays - all elements composing your geometrical object.

- -

 

- -

TUI command: - geompy.WhatIs(Shape), where Shape - is a shape from which a description is returned.

- -

 

- -

Arguments: - 1 shape.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

Check -

- -

 

- -

Description: - Returns True if this geometrical object is valid.

- -

 

- -

Result: Boolean.

- -

 

- -

TUI Command: - geompy.CheckShape(Shape), - where is shape which is checked for validity.

- -

 

- -

Arguments: - 1 shape.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

 

- -

 

- -

Check compound - of blocks

- -

 

- -

Description: - Checks whether a shape is a compound of glued blocks. 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 connected;

    • - -

  •  Two - quadrangle faces should be glued.

    • -
- -

 

- -

Informs of the following possible errors:

- -
    - -

  • not a block,

    • - -

  • not glued,

    • - -

  • not connected,

    • - -

  • extra - or degenerated edge.

    • -
- -

 

- -

Result: Boolean; - highlight in the viewer.

- -

 

- -

TUI Command: geompy.CheckCompoundOfBlocks(Compound). - Checks if the shape is - a valid compound of blocks. If it is true, then the validity flag is returned, - and encountered errors are printed in the python console.

- -

 

- -

Arguments: - 1 shape.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- - - - + + + + + +Titre + + + + + + + + + + + + + +

Using measurement tools

+ +

Measurement tools in GEOM are necessary for getting different + data concerning created or imported geometrical objects. They are:

+ +

 

+ + + +

 

+ +

Our TUI Scripts + show how to use Measurement Tools + with  TUI + commands.

+ +

 

+ +

To use measurement tools:

+ +

 

+ +

In the main menu select Measures + submenu.

+ +

 

+ +

 

+ +

  Point coordinates

+ +

 

+ +

Description: + Returns the coordinates of a point.

+ +

 

+ +

Result: Point + coordinates (X, Y, Z) in 3D space in the form of Python Tuple.

+ +

 

+ +

TUI command: + geompy.PointCoordinates(Point), + where Point is a point whose coordinates are inquired.

+ +

 

+ +

+ +

 

+ +

 

+ +

Basic properties +

+ +

 

+ +

Description: + Return the properties (Length, Surface & Volume) of a definite geometrical + object.

+ +

 

+ +

Result: Display + Length, Surface & Volume in the form of Python Tuple.

+ +

 

+ +

TUI command: + geompy.BasicProperties(Shape), + where Shape is a shape whose properties are inquired.

+ +

 

+ +

+ +

 

+ +

 

+ +

+ Center of mass

+ +

 

+ +

Description: + Creates a gravity center of a shape and returns its coordinates.

+ +

 

+ +

Result: GEOM_Object + (vertex).

+ +

 

+ +

TUI Command: + geompy.MakeCDG(Shape), where + Shape is the shape for which a center of gravity is computed.

+ +

 

+ +

+ +

 

+ +

 

+ +

Inertia +

+ +

 

+ +

Description: + Returns the inertia axis of a geometrical object.

+ +

 

+ +

Result: Display + the matrix and moments of inertia in the form of Python Tuple (I11, I12, + I13,

+ +

 I21, + I22, I23,

+ +

 I31, + I32, I33,

+ +

 Ix, + Iy, Iz).

+ +

 

+ +

TUI command: + geompy.Inertia(Shape), where + Shape is a shape for which a matrix of inertia and moment of inertia are + returned.

+ +

 

+ +

+ +

 

+ +

 

+ +

Bounding + box

+ +

 

+ +

Description: + Returns the dimensions of the bounding box of a geometrical object.

+ +

 

+ +

Result: Displays + the dimensions of the bounding box of a geometrical object in the form + of Python Tuple (Xmin, Xmax, Ymin, Ymax, Zmin, Zmax).

+ +

 

+ +

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

+ +

 

+ +

+ +

 

+ +

 

+ +

Min. distance

+ +

 

+ +

Description: + Returns the min. distance between 2 geometrical objects.

+ +

 

+ +

Result: Displays + the min. distance.

+ +

 

+ +

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

+ +

 

+ +

+ +

 

+ +

 

+ +

+ Tolerance

+ +

 

+ +

Description: + Returns the tolerance of a geometrical object.

+ +

 

+ +

Result: Displays + the tolerance values (FaceMinTol, FaceMaxTol, EgdeMinTol, EgdeMaxTol, + VertexMinTol, VertexMaxTol).

+ +

 

+ +

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

+ +

 

+ +

+ +

 

+ +

 

+ +

WhatIs +

+ +

 

+ +

Description: + Returns the type of a geometrical object.

+ +

 

+ +

Result: Displays + all elements composing your geometrical object.

+ +

 

+ +

TUI command: + geompy.WhatIs(Shape), where Shape + is a shape from which a description is returned.

+ +

 

+ +

+ +

 

+ +

 

+ +

Check +

+ +

 

+ +

Description: + Returns True if this geometrical object is valid.

+ +

 

+ +

Result: Boolean.

+ +

 

+ +

TUI Command: + geompy.CheckShape(Shape), + where is shape which is checked for validity.

+ +

 

+ +

+ +

 

+ +

 

+ +

 

+ +

Check compound + of blocks

+ +

 

+ +

Description: + Checks whether a shape is a compound of glued blocks. 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 connected;

    • + +

  •  Two + quadrangle faces should be glued.

    • +
+ +

 

+ +

Informs of the following possible errors:

+ +
    + +

  • not a block,

    • + +

  • not glued,

    • + +

  • not connected,

    • + +

  • extra + or degenerated edge.

    • +
+ +

 

+ +

Result: Boolean; + highlight in the viewer.

+ +

 

+ +

TUI Command: + geompy.CheckCompoundOfBlocks(Compound). + Checks if the shape is + a valid compound of blocks. If it is true, then the validity flag is returned, + and encountered errors are printed in the python console.

+ +

 

+ +

+ +

 

+ + + + diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm deleted file mode 100755 index d67650a0a..000000000 --- a/doc/salome/gui/GEOM/files/salome2_sp3_operationgui_functions.htm +++ /dev/null @@ -1,637 +0,0 @@ - - - - - -Titre - - - - - - - - - - - - -

Basic operations

- -

In GEOM you can perform - basic operations with geometrical objects aimed at creation of more complex - shapes. These operations are:

- -

 

- - - -

 

- -

To perform basic operations on geometrical objects:

- -

 

- -

In the main menu select Operations.

- -

 

- -

 

- -

Partition

- -

 

- -

Description: - Builds a shape by intersection.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.MakePartition(ListOfShapes, - ListOfTools, ListOfKeepInside, ListOfRemoveInside, Limit, RemoveWebs, - ListOfMaterials), where ListOfShapes is a list of shapes to be - intersected, ListOfTools is a list of shapes to intersect the shapes from - ListOfShapes, ListOfKeepInside is a list of shapes outside which the results - will be deleted, ListOfRemoveInside is a list of shapes inside which the - results will be deleted, Limit is a type of the result shapes, if RemoveWebs - is True the Glue 3D algorithm will be performed on the results, ListOfMaterials - is a list of materials indices for each shape, it makes sense only if - RemoveWebs is True.

- -

 

- -

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.

    • -
- -

 

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

Archimede

- -

 

- -

Description: - Creates a plane corresponding to the modeled water-line of the object - plunged into the water (in Z direction).

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.Archimede(Shape,Weight,WaterDensity,MeshingDeflection), - where Shape is a shape to put into the water, Weight is a weight of the - shape, WaterDensity  is - density of water, MeshingDeflection is a deflection of the mesh, using - to compute the section.

- -

 

- -

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

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

   

- -

 

- -

 

- -

Fillet

- -

 

- -

Description: - Make fillets of the edges of a shape.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.MakeFillet(Shape, Radius, - ShapeType, ListOfShapeID), where Shape is a shape to create a fillet - on, Radius is a radius of the fillet, ShapeType is a type of shapes to - be processed, ListOfShapeID is a list of subshapeÂ’s Ids to be processed.

- -

 

- -

Arguments:

- -
    - -

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

    • - -

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

    • - -

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

    • -
- -

 

- -

Dialog Box:

- -

 

- -

   

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

 

- -

Chamfer

- -

 

- -

Description: - Makes chamfer of the edges of a Shape.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: -

- -
    - -

  • geompy.MakeChamferEdge(Shape, - D1, D2, Face1, Face2), where Shape is a shape to create a chamfer - on, D1 is a chamfer size along Face1, D2 is a chamfer size along Face2, - Face1 and Face2 are indices of faces in Shape.

    • - -

  • geompy.MakeChamferFace(Shape, - D1, D2, ListOfFaceID), where Shape is a shape to create chamfer - on, D1 is a chamfer size along a face from  ListOfFaceID, -  D2 is a - chamfer size along two faces connected to the edge to which the chamfer - is applied, ListOfFaceID is a list of indices of faces in Shape.

    • -
- -

 

- -

Arguments:

- -

 

- -
    - -

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

    • - -

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

    • - -

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

    • -
- -

 

- -

Dialog Box:

- -

 

- -

   

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

 

- -

 

- -

 

- -

 

- -

Block - multi-transformation

- -

 

- -

Description: - Makes several translations of a block (solid) in one - or two directions depending on - the arguments specified by the user.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: -

- -
    - -

  • geompy. - MakeMultiTransformation1D(Block, DirFaceID1, DirFaceID2, NbTimes), - where Block is a block to be transformed, DirFaceID1 is an ID of the face - which defines the first direction of transformation, DirFaceID2 is an - ID of the face which defines the second direction of transformation, NbTimes - is a numeber of transformations.

    • - -

  • geompy. - MakeMultiTransformation2D(Block, DirFaceID1U, DirFaceID2U, NbTimesU, DirFaceID1V, - DirFaceID2V, NbTimesV), where Block is a block to be transformed, - DirFaceID1U and DirFace1V are IDÂ’s of the faces, which define directions - of the first transformation, DirFaceID1V and DirFaceID2V are IDÂ’s of the - faces which define directions of the second transformation, NbTimesU and - NbTimesV are numbers of transformations.

    • -
- -

 

- -

Arguments:

- -

 

- -
    - -

  • 1D - transformation: Name + 1 hexahedral - solid + 1 or 2 faces + 1 integer (number of blocks)

    • - -

  • 2D - transformation: Name + 1 hexahedral - solid +

    • - -
      - -

    • 2 - faces and 1 integer, or

      • - -

    • 3 or 4 faces and 2 integers

      • -
    -
- -

 

- -

Dialog Box:

- - --- - - - -
-

 -

- -

 

- -

Example:

- -

 

- -

    

- -

 

- -

 

- -

Explode - on Blocks

- -

 

- -

Description: - Returns blocks of the given compound. The user may define the type blocks - to be extracted by setting the minimum and maximum number of faces in - the target block. By checking the corresponding box the user may also - interactively choose the blocks from a compound .

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.MakeBlockExplode(Compound, - MinNbFaces, MaxNbFaces), where Compound is a compound to be exploded - into the blocks, MinNbFaces, MaxNbFaces are correspondingly the minimal - and  the - maximal number of faces of the resulting blocks.

- -

 

- -

Arguments: 1 compound + 1 integer (min. and max. number - of faces in the block to be extracted).

- -

 

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

 

- -

Propagate

- -

 

- -

Description: - Breaks a multitude of edges of a shape into groups (builds all possible - propagation groups).

- -

 

- -

Result: List - of GEOM_Objects. Each Geom Object will contain a group of edges.

- -

 

- -

TUI Command: - geompy.Propagate(Shape), - where Shape is a shape to build propagation groups on.

- -

 

- -

Arguments: 1 Shape.

- -

 

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

     

- - - - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions.htm deleted file mode 100755 index 96c0d677f..000000000 --- a/doc/salome/gui/GEOM/files/salome2_sp3_primitivegui_functions.htm +++ /dev/null @@ -1,395 +0,0 @@ - - - - - -Titre - - - - - - - - - - - -

Constructing primitives

- -

In - GEOM you can create different types of primitive geometrical objects (3D - elements):

- -

 

- - - -

 

- -

To construct primitive geometrical objects:

- -

 

- -

In the main menu select New - Entity > Primitives.

- -

 

- -

Box

- -

 

- -

Description: Creates a box.

- -

 

- -

Result: GEOM_Object (SOLID).

- -

 

- -

TUI Command : geompy.MakeBox(X1, - Y1, Z1, X2, Y2, Z2),  where - (X1, Y1, X2) and (X2, Y2, Z2) are coordinates of two points which define - a diagonal of the box.

- -

 

- -

Arguments:

- -
    - -

  • 1st Constructor - : Name + 2 vertices (opposite - corners of the box).

    • - -

  • 2nd Constructor - : Name + 3 values (dimensions - at origin).

    • -
- -

 

- -

Dialog Box:

- -

 

- -

 

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

Cylinder

- -

 

- -

Description: Creates a cylinder.

- -

 

- -

Result: GEOM_Object (solid).

- -

 

- -

TUI Command: geompy.MakeCylinder(Point, - Axis, Radius, Height), where Point is a central point of the cylinder - base, Axis (vector value) is an axis of the cylinder, Radius and Height - are correspondingly a radius and a height of the cylinder.

- -

 

- -

Arguments:

- -
    - -

  • 1st Constructor: - Name + 1 vertex + 1 vector + 2 values - (Dimensions: radius and height).

    • - -

  • 2nd Constructor: - Name + 2 values (Dimensions at origin: - radius and height).

    • -
- -

 

- -

Dialog Box:

- -

 

- -

 

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

Sphere

- -

 

- -

Description: Creates a sphere.

- -

 

- -

Result: GEOM_Object (solid).

- -

 

- -

TUI Command: geompy.MakeSphere(Point, - Radius), where Point is a center of the sphere and Radius is a - radius of the sphere.

- -

 

- -

Arguments:

- -
    - -

  • 1st Constructor - : Name + 1 vertex + 1 value - (Radius).

    • - -

  • 2nd Constructor - : Name + 1  value - (Radius from the origin).

    • -
- -

 

- -

Dialog Box:

- -

 

- -

 

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

Torus

- -

 

- -

Description: Creates a torus.

- -

 

- -

Result: GEOM_Object (solid).

- -

 

- -

TUI Command: geompy.MakeTorus(Point, - Vector, RadiusMajor, RadiusMinor), where Point is a central point - of the torus, Vector is an axis of symmetry, RadiusMajor and RadiusMinor -  are correspondingly - a major and minor radiuses of the torus.

- -

 

- -

Arguments:

- -
    - -

  • 1st Constructor: - Name + 1 vertex + 1 vector (for - direction) + 2 values (1 & 2 Radius).

    • - -

  • 2nd Constructor: - Name + 2 values (1 & 2 Radius - from the origin).

    • -
- -

 

- -

Dialog Box:

- -

 

- -

 

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

Cone

- -

 

- -

Description: Creates a cone.

- -

 

- -

Result: GEOM_Object (SOLID).

- -

 

- -

TUI Command: geompy.MakeCone(Point, - Axis, Radius1, Radius2), where Point is a central point of the - cone base, Axis (vector value) is an axis of the cone, Radius1 and Radius2 - are correspondingly the first and the second radiuses of the cone

- -

 

- -

Arguments:

- -
    - -

  • 1st Constructor: - Name + 1 vertex + 1 vector (for - direction) + 3 values (Radius of the base part, radius of the upper part, - height).

    • - -

  • 2nd Constructor: - Name + 3 values (Radius of the base - part, radius of the upper part, height).

    • -
- -

 

- -

Dialog Box:

- -

 

- -

 

- -

 

- -

Example:

- -

 

- -

- - - - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions.htm deleted file mode 100755 index 56d2c9c22..000000000 --- a/doc/salome/gui/GEOM/files/salome2_sp3_repairgui_functions.htm +++ /dev/null @@ -1,898 +0,0 @@ - - - - - -Titre - - - - - - - - - - - - -

Repairing geometrical objects

- -

Repairing operations are - used for adjustment and modification of created geometrical shapes. The - are:

- -

 

- - - -

 

- -

The operations Suppress - faces, Close contour, Suppress internal wires, Suppress holes and - Add point on edge are - available only if you are using OCC - viewer.

- -

 

- -

To apply repairing operations:

- -

 

- -

In the main menu select Repair - submenu.

- -

 

- -

Shape - processing

- -

 

- -

Description: - Processes a shape using various operators.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.ProcessShape(Shape, Operators, - Parameters, Values), where Shape is a processed shape, Operators - is a list of names of operators ("FixShape", "SplitClosedFaces", - etc.), Parameters is a list of names of parameters (“FixShape.Tolerance3d”, - etc), Values is a list of values of parameters in the same order as the - Parameters list.

- -

 

- -

Arguments: - 1 or more shapes.

- - - --- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-

1

 -

SplitAngle – - this operator is intended for splitting faces based on conical surfaces, - surfaces of revolution and cylindrical surfaces by angle

-

SplitAngle.Angle – angle (in radians) defining - size of result segments.

-

SplitAngle.MaxTolerance – maximal possible - tolerance on result shape

-

2

 -

SplitClosedFaces - – this operator is intended for dividing all closed faces in the shape - according to the number of points.

-

SplitClosedFaces.NbSplitPoints – number of - points for cutting each closed faces.

-

3

 -

FixFaceSize - – this operator is intended for removing small faces (case of the spot - face and strip face)

-

FixFaceSize.Tolerance – work tolerance defining - which faces will be removed.

-

4

 -

DropSmallEdges - – this operator is intended for removing small edges or merging with neigbour. -  

-

DropSmallEdges.Tolerance3d – work tolerance - for detection and removing small edges.

-

5

 -

BsplineRestriction - –this operator is intended for re-approximation BSplines curves and surfaces - or conversion of the curves and surfaces to BSplines with specified parameters. -

-

BSplineRestriction.SurfaceMode - mode of approximation - of surfaces if restriction is necessary

-

BSplineRestriction.Curve3dMode -mode of conversion - of any 3D curve to BSpline and approximation.

-

BSplineRestriction.Curve2dMode - mode of conversion - of any 2D curve to BSpline and approximation

-

BSplineRestriction.Tolerance3d – work tolerance - for definition of the possibility of the approximation of the surfaces - and 3D curves with specified parameters.

-

BSplineRestriction.Tolerance2d - work tolerance - for definition of the possibility of the approximation of the 2D curves - with specified parameters.

-

BSplineRestriction.Continuity3d – desired continuity - of the resultant surfaces and 3D curves.

-

BSplineRestriction.Continuity2d – desired continuity - of the resultant 2D curves.

-

BSplineRestriction.RequiredDegree - required - degree of the resultant BSplines

-

BSplineRestriction.RequiredNbSegments - required - maximum number of segments of resultant BSplines.

-

6

 -

SplitContinuity - – this operator is intended for splitting shapes to achieve continuities - of curves and surfaces less than specified ones.

-

SplitContinuity.Tolerance3d - 3D tolerance - for correction of geometry.

-

SplitContinuity.SurfaceContinuity - required - continuity for surfaces.

-

SplitContinuity.CurveContinuity - required - continuity for curves.

-

7

 -

ToBezier - this - operator is intended for conversion of the curves and surfaces of the - all types into Bezier curves and surfaces.

-

ToBezier.SurfaceMode - mode of conversion of - the surfaces.

-

ToBezier.Curve3dMode – mode for conversion - of the 3D curves.

-

ToBezier.Curve2dMode – mode for conversion - of the 2D curves.

-

ToBezier.MaxTolerance – max possible tolerance - on the resultant shape.

-

8

 -

FixShape – this - operator is intended for correction of the invalid shapes

-

FixShape.Tolerance3d – work tolerance for detection - of the problems and correction of them.

-

FixShape.MaxTolerance3d - maximal possible - tolerance of the shape after correction.

-

9

 -

SameParameter - – this operator is intended for fixing edges having not same parameter - 2D and 3D curves.

-

SameParameter.Tolerance3d – tolerance for detection - and fix problems.

- -

 

- -

 

- -

Dialog Box:

- -

 

- -

 

- -

 

- -

Example:

- -

 

- -

Shape before applying Shape Processing (FixShape - operator).

- -

 

- -

   

- -

 

- -

The - same shape after applying Shape Processing.

- -

 

- -

- -

 

- -

 

- -

Suppress faces

- -

 

- -

Description: - Suppresses a face of a shape.

- -

 

- -

Result: GEOM_Object - (ListOfGeomShapes).

- -

 

- -

TUI Command: - geompy.SuppressFaces(Shape, ListOfID), - where Shape is a shape to be processed, ListOfID is a list of faces ID's - to be removed.

- -

 

- -

Arguments: - Name + Faces which should be removed (you can select them in the 3D viewer).

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

Close contour

- -

 

- -

Description : - Closes an open contour and modifies the underlying face (if needed) in - accordance with user specified mode:

- -
    - -

  • By common vertex – a - vertex is created between the end points of the contour and its tolerance - is increased to a value of the gap between the ends of the contour;

    • - -

  • By new edge – a new edge - is inserted between the end points of the contour.

    • -
- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.CloseContour(Shape, Wires, - IsCommonVertex), where Shape is a shape to be processed, Wires - is a list of edges or wires IDÂ’s which has to be closed within the shape - (if the list contains only one element = -1, the shape itself is considered - as a wire),  IsCommonVertex - if this parameter is True a closure has to be done by creation of a common - vertex, otherwise an edge is added between the end vertices.

- -

 

- -

Arguments: Name + 1 shape + contour (Wire, - or a set of Edges) + mode of closure (by vertex or by edge)

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

Suppress - internal wires

- -

 

- -

Description : - Removes all internal wires or specified internal wires from user specified - faces.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.SuppressInternalWires(Shape, - Wires), where Shape is a shape where wires are to be removed, Wires - is a list of wires IDÂ’s to be removed; if the list is empty then all internal - wires are removed.

- -

 

- -

 

- -

Arguments:

- -
    - -

  • Name of the resulting - object

    • - -

  • User specified face

    • - -

  • User specified internal - wires (lying on this face except for its boundary), or, in case the Remove all internal wires box is checked, - all internal wires

    • -
- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

   

- -

 

- -

 

- -

Suppress - holes

- -

 

- -

Description : -

- -
    - -

  • 1st - Constructor : Suppresses a hole in a shape.

    • - -

  • 2nd - Constructor : Suppresses a hole in a face.

    • -
- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.SuppressHoles(Shape, - ListOfWireID), where Shape is a - shape where holes must be removed, ListOfWireID is a list of wire sub - shapes IDÂ’s. If it is empty, then all holes are removed.

- -

 

- -

Arguments: Name - + 1 shape + Wires which should be removed.

- -

Remove all - holes checkbox allows to fill all holes of a definite shape.

- -

Detect button - allows to display the number of free boundaries in your shape:

- -

 

- -

- -

 

- -

Dialog Box:

- -

 

- -

 

- -

  

- -

Example:

- -

 

- -

   

- -

 

- -

 

- -

 

- -

Sewing

- -

 

- -

Description: - Sew several  shapes.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command : - geompy.MakeSewing(ListOfShape, Precision), - where ListOfShape is list of shapes to be sewed, Precision is a precision - for sewing.

- -

 

- -

Arguments: - Name + 1 or more shapes + 1 value (sew precision).

- -

Detect - button allows to display the number of free boundaries in your - shape:

- -

 

- -

- -

 

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

 

- -

 

- -

Add point on edge

- -

 

- -

Description: - Splits an edge in two in accordance with the specified mode (by length - or by parameter) and a value specifying the position of the point on edge - (for example val =0.5; mode = Length).

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command : - geompy.DivideEdge(Shape, EdgeID, - Value, IsByParameter), where Shape is a shape which contains an - edge to be divided, EdgeID is the ID of the edge to be divided, if it - = -1, then Shape is an edge, Value is a paramter on the edge or a length. - IsByParameter if it is True then Value is the edge parameter in the range - [0:1] otherwise it is a length of the edge in the range [0:1]

- -

 

- -

Arguments: - Name + 1 Edge + 1 value setting the position of the point according to - one of the selected modes

- -

 

- -

Dialog - Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

     

- -

 

- -

 

- -

 

- -

Glue faces

- -

 

- -

Description: - Glues faces that are coincident with respect to the given tolerance

- -

value.

- -

 

- -

Result: - GEOM_Object.

- -

 

- -

TUI Command - : geompy.MakeGlueFaces(theShape, - theTolerance), where theShape is a compound of shapesto be glued, - theTolerance is a maximum distance between two faces, which can be considered - as coincident.

- -

 

- -

Arguments: - Name + 1 Compound - + Tolerance value

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

  

- -

 

- -

 

- -

 

- -

Check free boundaries

- -

 

- -

Description: - Detects wires and edges that correspond to the shape's boundary, and highlights - it

- -

 

- -

Result: GEOM_Object. -

- -

 

- -

TUI Command : (NoError, ClosedWires, OpenWires) = geompy.GetFreeBoundary(Shape), - where Shape is a shape to be checked, NoError is false if an error occurred - while checking free boundaries, ClosedWires is a list of closed free boundary - wires, OpenWires is a list of open free boundary wires.

- -

 

- -

Arguments: - Shape

- -

 

- -

Dialog - Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

  

- -

 

- -

 

- -

 

- -

Check free - faces

- -

 

- -

Description: - Retrieves all free faces from a given shape. A free face is - a face not shared between two shells of the shape.

- -

 

- -

Result: GEOM_Object. - Returns a list of IDs of all free faces, contained in the shape.

- -

 

- -

TUI Command : GetFreeFacesIDs(Shape), where - Shape is a shape to be checked.

- -

 

- -

Arguments: - Shape

- -

 

- -

Dialog - Box:

- -

 

- -

- -

 

- -

 

- - - - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions.htm b/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions.htm deleted file mode 100755 index 956e7ec71..000000000 --- a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions.htm +++ /dev/null @@ -1,669 +0,0 @@ - - - - - -Titre - - - - - - - - - - - - -

Using transformation operations

- -

In GEOM there is a set - of operations allowing to transform the initial geometrical object into - other objects, which will be also created. These operations are

- -

 

- - - -

 

- -

All these operations are accessible in the - main menu, via Operations / Transformation.

- -

 

- -

Translation

- -

 

- -

Description: - Makes a translation of a shape.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.MakeTranslation(Shape, DX, - DY, DZ), where Shape is a shape to be translated, DX, DY, DZ are - components of translation vector.

- -

 

- -

Arguments: -

- -
    - -

  • 1st - Constructor: Name + 1 shape - + 3 values (coordinates).

    • - -

  • 2st - Constructor: Name + 1 shape - + 2 vertices.

    • - -

  • 3st - Constructor: Name + 1 shape - + 1 vector.

    • -
- -

 

- -

Create a copy - checkbox allows to keep the initial object, otherwise it will be - removed.

- -

 

- -

Dialog Box:

- -

 

- -

   

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

Rotation -

- -

 

- -

Description: - Rotates the initial shape.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.MakeRotation(Shape, Axis, - Angle), where Shape is a shape to be rotated, Axis is an axis of - rotation, Angle is an angle of rotation.

- -

 

- -

Arguments: - 1 shape + 1 vector for direction of rotation + 1 angle.

- -

Reverse checkbox - allows to specify the direction of rotation.

- -

Create a copy - checkbox allows to keep the initial object, otherwise it will be - removed.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

 

- -

Modify the Location

- -

 

- -

Description: - Modification of location of an object.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.MakePosition(theObject, theStartLCS, theEndLCS), where 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.

- -

 

- -

Arguments: - Name + 1 GEOM_Object + [Starting Coordinate System] + End Coordinate System.

- -

Create a copy - checkbox allows to keep the initial object, otherwise it will be - removed.

- -

 

- -

Dialog Box:

- -

 

- -

  

- -

 

- -

Example:

- -

 

- -

- -

 

- -

 

- -

 

- -

Mirror -

- -

 

- -

Description: - Symmetrical copy of a shape.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.MakeMirrorByPlane(Shape, - Plane), where Shape is a shape to be mirrored, Plane is a plane - of symmetry.

- -

 

- -

Arguments: -

- -
    - -

  • 1st - Constructor: Name + 1 shape - + 1 vertex.

    • - -

  • 2st - Constructor: Name + 1 shape - + 1 vector.

    • - -

  • 3st - Constructor: Name + 1 shape - + 1 plane.

    • -
- -

Create a copy - checkbox allows to keep the initial object, otherwise it - will be removed.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

Scale transform -

- -

 

- -

Description: - Creates a scaled shape basing on the initial shape.

- -

 

- -

Result: GEOM_Object.

- -

 

- -

TUI Command: - geompy.MakeScaleTransform(Shape, - CenterOfScale, Factor), where Shape is a shape to be scaled, CenterOfScale - is a center point of scale, Factor is a factor of the scale.

- -

 

- -

Arguments: - Name + 1 shape(s) + 1 vertex + 1 Scale Factor.

- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

 

- -

 

- -

 

- -

Offset surface

- -

 

- -

Description: - Each point is translated along a local normal by a given distance (signed - number, negative value meaning inner offset). Offset operation is applicable - to faces, shells and solids.

- -

 

- -

Result: GEOM_Object -

- -

 

- -

TUI Command: - geompy.MakeOffset(Shape, Offset), - where Shape is a shape which has to be an offset, Offset is a value of - the offset.

- -

 

- -

Arguments:

- -
    - -

  • Name of the resulting - object

    • - -

  • GEOM_Object (face, shell, - solid, compound)

    • - -

  • offset value

    • -
- -

 

- -

Dialog Box:

- -

 

- -

- -

 

- -

Example:

- -

- -

 

- -

 

- -

Multi-Translation

- -

 

- -

Description: - Makes several translations of a shape in one - or two directions.

- -

 

- -

Result: GEOM_Object - (compound).

- -

 

- -

TUI Command:

- -
    - -

  • geompy.MakeMultiTranslation1D(Shape, - Dir, Step, NbTimes), where Shape is a shape to be translated, Dir - is a direction of translation, Step is a step of the translation, NbTimes - is a number of times the shape must be moved.

    • - -

  • geompy.MakeMultiTranslation2D(Shape, - Dir1, Step1, NbTimes1, Dir2, Step2, NbTimes2), where Shape is a - shape to be translated, Dir1 is the first direction of translation, Step1 - of the first translation, NbTimes1 is a number of translations to be done - along, Dir2 is the second direction of translation, Step2 of the second - translation, NbTimes2 is a number of translations to be done along Dir2.

    • -
- -

 

- -

Arguments:

- -
    - -

  • 1st - Constructor (in one direction): - Name + 1 shape + 1 vector (for direction) + 1 step value + 1 value (repetition).

    • - -

  • 2nd - Constructor (in two directions): - Name + 1 shape + 2 vectors defining the direction + 2 step values + 2 - values (repetitions).

    • -
- -

 

- -

Dialog Box:

- -

 

- -

 

- -

 

- -

Example:

- -

 

- -

One direction:

- -

 

- -

 

- -

 

- -

Two directions:

- -

 

- -

 

- -

 

- -

 

- -

Multi-Rotation

- -

 

- -

Description: - Creates several rotated geometrical objects in one - or two directions - basing on the initial geometrical object.

- -

 

- -

Result: GEOM_Object - (compound).

- -

 

- -

TUI Command:

- -
    - -

  • geompy.MakeMultiRotation1D(Shape, - Axis, NbTimes), where Shape is a shape to be rotated, Axis is an - Axis of rotation, NbTimes is a number of the shape must be rotated.

    • - -

  • geompy.MakeMultiRotation2D(Shape, - Axis, Angle, NbTimes1, Step, NbTimes2), where Shape is a shape - to be rotated, Axis is an axis of rotation, Angle is an angle of rotation, - NbTimes1 is a number of rotation, Step is a step of translation, NbTimes2 - is a number of translation.

    • -
- -

 

- -

Arguments:

- -
    - -

  • 1st - Constructor (in one direction): - Name + 1 shape + 1 vector for direction + 1 value (repetition).

    • - -

  • 2nd - Constructor (in two directions): - Name + 1 shape + 1 vector for direction + 1 angle + 1 value (repetition) - + 1 step value + 1 value (repetition); Reverse - checkbox allows to set the direction of rotation.

    • -
- -

 

- -

Dialog Box:

- -

 

- -

 

- -

 

- -

Example:

- -

 

- -

One direction:

- -

 

- -

 

- -

 

- -

Two directions:

- -

 

- -

 

- -

 

- -

 

- - - - diff --git a/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image130.gif b/doc/salome/gui/GEOM/files/salome2_sp3_transformationgui_functions_salome2_sp3_transformationgui_functions_image130.gif deleted file mode 100755 index 980336276f002e4f2cf9d0fcb143de5b6284b1be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 935 zcmZ?wbhEHb6k!ly_|5y)HW1X7zawZj< zmzf+*y6HL3O`8b#?YMjBzoN@Qm*4JT+Sqo=f;b>Uovy5fksuZoSiw`pv MJhT#(5MZzd05OzH&Hw-a diff --git a/doc/salome/gui/GEOM/geompy_doc/GEOM__TestMeasures_8py.html b/doc/salome/gui/GEOM/geompy_doc/GEOM__TestMeasures_8py.html deleted file mode 100644 index 06a37f66a..000000000 --- a/doc/salome/gui/GEOM/geompy_doc/GEOM__TestMeasures_8py.html +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - Main Page - - - -  -
- -
- - - - - -

GEOM_TestMeasures.py File Reference

- - - - -

Namespaces

namespace  GEOM_TestMeasures
-
Generated on Tue Oct 18 00:47:36 2005 for SALOME - GEOM - v.2.1.0 by - -doxygen 1.3.7
- - diff --git a/doc/salome/gui/GEOM/geompy_doc/doxygen.png b/doc/salome/gui/GEOM/geompy_doc/doxygen.png deleted file mode 100644 index 9da55f95f5e73ec180fc0087b782a317a4fba360..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1576 zcmV+@2G{wCP)mTE7iMK@y$u@#4ypV zEj>3KXI?j8Ur<0lGX40;{Peus)SvtCuOA%~|IEzava+cnA`%onARr(iAt53nA|oRs zBqSsyB_$>%CMPE+C@3f?DJd!{Dl021EG#T7EiEoCE-x=HFfcGNF)=bSGBYzXG&D3d zH8nOiHa9mnI5;>tIXOByIy*Z%JUl!-Jv}}?K0iM{KtMo2K|w-7LPJACL_|bIMMXwN zMn^|SNJvOYNl8jdN=r*iOiWBoO-)WtPESuyP*6}&QBhJ-Qd3h?R8&+|RaI72R##V7 zSXfwDSy@_IT3cINTwGjTU0q&YUSD5dU|?WjVPRroVq;@tWMpJzWo2e&W@l$-XlQ6@ zX=!R|YHMq2Y;0_8ZEbFDZf|dIaBy&OadC2Ta&vQYbaZreb#-=jc6WDoczAeud3kzz zdV70&e0+R;eSLm@et&;|fPjF3fq{a8f`fyDgoK2Jg@uNOhKGlTh=_=ZiHVAeii?Yj zjEszpjg5|uj*pLzkdTm(k&%*;l9Q8@l$4Z}m6ev3mY0{8n3$NEnVFiJnwy)OoSdAU zot>VZo}ZteprD|kp`oIpqNAguq@<*!rKP5(rl+T;sHmu^si~@}s;jH3tgNi9t*x%E zuCK4Ju&}VPv9YqUva_?Zw6wIfwY9dkwzs#pxVX5vxw*Q!y1To(yu7@dCU$jHda$;ryf%FD~k%*@Qq&CSlv&d<-!(9qD) z(b3Y<($mw^)YR0~)z#M4*4Nk9*x1lt)=I7_<=;-L_>FMg~>g((4?Ck9A?d|UF?(gsK@bK{Q@$vHV^7Hfa z^z`)g_4W4l_V@Sq`1ttw`T6?#`uqF){QUg={r&#_{{R2~uQTr=00001bW%=J06^y0 zW&i*H0b)x>L;#2d9Y_EG010qNS#tmYZoL2iZoL77nipsQ000McNliru(+UU`3miIP z5O4qh0-;GnK~#9!?N)1#+At8r4QbZS1Bi)B@X`POGrO~E$A%AgLOLq7VkPj*zQ!@h zhTX0hsqJ2BWSn#6)grEG8uu1?i~PeP!(R~@hS!Otfs#dt%7m$xGIT0$nMDQDeL#bl zCv1a?WQq|3tczJ_F=^_kcdOHs%uMCqrWCt|Vvd5@uo3J+3=R=al+z^jR&|c5E{3Xx zNu_p4tD#Pj??n&NX%Sfg;jWcb<->5pgGy?ePAg|@ho{B(EP4TyZjc}%n&&8OpxTXA zr8`NUj>hnjm`0wHJIecQ)J!D7ylD*>`Sx%+@!`z0g|=K=lO8z1J@a04Tkf4 zY5Hl-U(*wIUDzy_F@5vj0`6P24D1-j>TpmD&ahs9$73K6chx-R5esE>N4^Qn4cek(bLm2F*0#8Gjn5v_=Pb4;{i2* z19Tt|bRb~D0Db_5H~@p1fFPBV2KJW${&T?K2qX)di z?`zce0C|9hT}V!w_Mpi{l&~KM=El7&I+0VQuQ^TMuZYS!_(#w)9OB~U;XQIxO#GOH zf})bLit35eXLPVQUA*4eb7tlimR8n|)MUB1y154g23-y&TnV{(D>CYK^qrWb`^gVd zh^Y_LvU8r~<~_}SR!~-6QAw_P@v{0&V^ecWYg>EAhu*%A{R5u{hbAVcre|j7zI>fu zU0eVDV`Fn`d*>$?3?TlBMZNwN?C-b^P`ThpBm#;0$pwQ4Qw?zdNh2gj%dTyLy6AUM z7;}S;jW zyesJo!^!0I?ND|sYLPj5wEO@KC!zan%$G_ZM%SIuZc@H=ZGt1)3#;jP=Q#FLx&;j< zBJhoH)svNME0?3HZv}UHV7fWmYZARiUW+`qBh~SUT)gnO0q}{TXTwzmS>}g&wL|k< zpBhCE>W5yD|J<@X>r+>4rZd!8wSU$*!SCMd=N1&D{v%~IeSt3u9V^Hy`*mc;>iEyN zu{pU|i4IgJ_x7K@q5P{oBLtDg0ljQ}E?XXdhnFdsNjxvkT%w_jcuCFBBICj3sm39* z51$MBW6U?&EDa0ZW@YlNgu|5}P+k96)87fq2L1t`DcmB%o-#Bn*^>((G}a^8*#EIR(&y7Bm3gSm%J)hYPH z8ytM2spa8?TIQlGjc8+(99PU$y^UwjFm9R`@0%0^xi@TQva3wdDOw$+Ul<*3eLyUMP!v+MtEm18W0zHRHYkdL~OCs}* zcWq4C#1f7?X5kfo@{k>e3>4x?2n|}ap(g#8Hz~l2W~Pu_W!$P*+h(f!#JFP~ONahJ z8?N%8H_)DGYd|-u5%;Rspts#yjO_eQ7Dg!p(X79qpU>p?N-4-ca*VAJI+B+n&8#-^fpk zw(Lp?C;S@nDu2UuDg? zx<1<60H57Se1-0`Q@qIB^fsJqfh2Z?SRBb58!3rb7!C1wCgT{Us#C(G0slH|B+Lz^i>J9X9%Ir-?!3BCwZq!s_s(^$|J>!?Ep3&2O z7kOglKd2ouvAXw%T#9(+F+Sh(fByAfomQvq4xS>hePe2hH}4u+lJQqBQJPhW-f87k z?n|qBMtI(ID2b4;!(GwRt04IRFYFX{lCYOLeN|~el6ek=(l{=6zmJvG%?(XhjPn$# z3g?~)Z1Pnl5O4O#3+Ah+@|&MIiR#VkuRO1B8f~jFx@Oz*Tq>r!bj6W?4cL3Z{O7C&Ak@HjGH=jcsoQncbL|1~wI znm#)P6GZt94v$KIT|v3&bSB>%F`nXxaLHi^l+;j*Rt^NTtV_)nAuupXH4_MAN?T^a z3tBI&VoP(UC(h9z=o9hj*%DOozV*S+l~%by7-98m-C>}U zja`vksn8XYE|B*eM6HKw4F!WPMst9ywT3|N>!yzQ`KruX@J;lZAi@jI&jSG+KI%9%%LJKsis4MlAbuP zID}uvT+Fvd)2C`3KHj(5>u$f#;5V?IY9w>DJ|v>^9e6D+!}$`oNMn48+ux&=a|gdvu}6St!AYI%z1Iz5?oKy^%}2FeTxcQ- zY;164qFt~fcSNU4#ZnybqDenbMGd9pZ18KvpR4|(9lL*;^DVo!I$jEM3@;MIRQ%*Z z1S|5u5J?9(ep%P|P~Xv*E?(DqyHTdsRIxD~!D5IPx9N1iJ62ki&N3~S9mW~%x)9ab z_cL~wQf1&v!|BeJPTtstk(WFT=qR%bZfS|bQxBbD+pEdMwwJe*#*@6vC;n7EW^RrG z6H%wq^Pd*yGxnM2=(5?_X-g$8PH$yt+_d z^Cr3Nz6#)v$Uc*DH5{f^ZpQMlb=cJKtMpcrf`k5Ejx^rY3w92 zG{|Vw{J+hGWG6*r?*arO!zTHziS05jQi8Haw(C9CN{KP=1zkFu9p2PyR~D=LczY{+i8 zmFy&kt>r>ss35t%!f^2tvz{#D74K4ogHJc2&b-gC(5x23R7n_Wv7%ew-J8LWF9t2o zmG6q`tzgUArHCe?LVQbAX_i>+h0_5;NyBe=XWkB!N~dA_&x&##ot#uL7rQnLbGe}U z>62=!kx9zq@D0u1*Gzf7dxqLkt#fm>Y@BQKihM~!JnN3AqnbY~hnm13l2hu%oJi;N zifr^`2A!ZG+^x93O=qs<{87(E-1)({bbjv!w9{D`b*@Q9%RfGRDoGJZ!8*N&--vEG zZ{u;eI49}$Yztw$=kennf!F^clXn^?_Dw^JB>L5Cy9*+fT%C-aX*v+?+x{K6cZqiC zA3GCiwj%luDv%{-qG#?slo7d>Ek`sTYW2vU&e|@`P*DiqVEqk?x_41&5O{`zfQ0>i zL9N8HVNGd7mq%)CMQv=?O(}Y(kVK7mO%+&z1h4vj~JZSh&0E0cLs?(Kg6w8+@u>R~VW3m9D{_a>BQ%Sqb^tX6S}alcfpNKl@eX|sRnW4ghSqIXZ^-@!bp zQn{l3$RnKnGXs&}4|_hg(slAUwN<9vrb>-jsvJ5O)~K@8NQtl(q>7J6RJmb{QVpA2 z4(lLS_X{SQ zhP_`mnfJ7Fbp>ojJE_CvYcd`#hE1ejy$AtqX;!Mtc}JC8KlACgdV3#Pp}7kIWvUR$ zWLiWthg{EDWeJWKi&r$_7@TLT$kNjNfG-owU|qJz!=Xslbvz$EiKe}Qi7dnJ$|SeG zl=)Tf_t>@wbiL7=%v zf^g}9*J6;qng=+w9p)UpFw!c*9Elxg3s%xyT4tIj>pyd=#@+U+FSdac`s-{~HTP**P{u}vWefs5}ROEkFrT^74Xz)J(LNt#- diff --git a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.map b/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.map deleted file mode 100644 index 5a14779e7..000000000 --- a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.map +++ /dev/null @@ -1 +0,0 @@ -base referer diff --git a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.md5 b/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.md5 deleted file mode 100644 index 1f2d2ba0e..000000000 --- a/doc/salome/gui/GEOM/geompy_doc/geompy_8py__incl.md5 +++ /dev/null @@ -1 +0,0 @@ -0848e1ec9d428b6f7446355ed9f585a7 \ No newline at end of file diff --git a/doc/salome/gui/GEOM/geompy_doc/namespaceGEOM__TestMeasures.html b/doc/salome/gui/GEOM/geompy_doc/namespaceGEOM__TestMeasures.html deleted file mode 100644 index 24ab2972a..000000000 --- a/doc/salome/gui/GEOM/geompy_doc/namespaceGEOM__TestMeasures.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - Main Page - - - -  -
- -
- - - - - -

Package GEOM_TestMeasures

Module "GEOM_TestMeasures". -More... -

- - - - - -

Functions

 TestMeasureOperations (geompy, math)
-

Function Documentation

-

- - - - -
- - - - - - - - - - - - - - - - - - -
TestMeasureOperations ( geompy ,
math 
) 
-
- - - - - -
-   - - -

-

-

Generated on Tue Oct 18 00:47:37 2005 for SALOME - GEOM - v.2.1.0 by - -doxygen 1.3.7
- - diff --git a/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html b/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html index 189eb4505..768eb3629 100644 --- a/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html +++ b/doc/salome/gui/GEOM/geompy_doc/namespacegeompy.html @@ -8,535 +8,600 @@   -
- -
- - - -

Package geompy

Module geompy. -More... + +

Package geompy

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

Functions

 init_geom (theStudy)

Functions

def init_geom
def SubShapeName
 Get name for sub-shape aSubObj of shape aMainObj.
def addToStudy
 Publish in study aShape with name aName.
def addToStudyInFather
 Publish in study aShape with name aName as sub-object of previously published aFather.
def MakeVertex
 Create point by three coordinates.
def MakeVertexWithRef
 Create a point, distant from the referenced point on the given distances along the coordinate axes.
def MakeVertexOnCurve
 Create a point, corresponding to the given parameter on the given curve.
def MakeVectorDXDYDZ
 Create a vector with the given components.
def MakeVector
 Create a vector between two points.
def MakeLine
 Create a line, passing through the given point and parrallel to the given direction.
def MakeLineTwoPnt
 Create a line, passing through the given points.
def MakePlane
 Create a plane, passing through the given point and normal to the given vector.
def MakePlaneThreePnt
 Create a plane, passing through the three given points.
def MakePlaneFace
 Create a plane, similar to the existing one, but with another size of representing face.
def MakeMarker
 Create a local coordinate system.
def MakeMarkerPntTwoVec
 Create a local coordinate system.
def MakeArc
 Create an arc of circle, passing through three given points.
def MakeCircle
 Create a circle with given center, normal vector and radius.
def MakeCircleThreePnt
 Create a circle, passing through three given points.
def MakeEllipse
 Create an ellipse with given center, normal vector and radiuses.
def MakePolyline
 Create a polyline on the set of points.
def MakeBezier
 Create bezier curve on the set of points.
def MakeInterpol
 Create B-Spline curve on the set of points.
def MakeSketcher
 Create a sketcher (wire or face), following the textual description, passed through theCommand argument.
def MakeSketcherOnPlane
 Create a sketcher (wire or face), following the textual description, passed through theCommand argument.
def MakeBox
 Create a box by coordinates of two opposite vertices.
def MakeBoxDXDYDZ
 Create a box with specified dimensions along the coordinate axes and with edges, parallel to the coordinate axes.
def MakeBoxTwoPnt
 Create a box with two specified opposite vertices, and with edges, parallel to the coordinate axes.
def MakeCylinder
 Create a cylinder with given base point, axis, radius and height.
def MakeCylinderRH
 SubShapeName (aSubObj, aMainObj)
 Create a cylinder with given radius and height at the origin of coordinate system.
def MakeSpherePntR
 Get name for sub-shape aSubObj of shape aMainObj.

 addToStudy (aShape, aName)
 Create a sphere with given center and radius.
def MakeSphere
 Publish in study aShape with name aName.

 addToStudyInFather (aFather, aShape, aName)
 Create a sphere with given center and radius.
def MakeSphereR
 Publish in study aShape with name aName as sub-object of previously published aFather.

 MakeVertex (theX, theY, theZ)
 Create a sphere with given radius at the origin of coordinate system.
def MakeCone
 Create point by three coordinates.

 MakeVertexWithRef (theReference, theX, theY, theZ)
 Create a cone with given base point, axis, height and radiuses.
def MakeConeR1R2H
 Create a point, distant from the referenced point on the given distances along the coordinate axes.

 MakeVertexOnCurve (theRefCurve, theParameter)
 Create a cone with given height and radiuses at the origin of coordinate system.
def MakeTorus
 Create a point, corresponding to the given parameter on the given curve.

 MakeVectorDXDYDZ (theDX, theDY, theDZ)
 Create a torus with given center, normal vector and radiuses.
def MakeTorusRR
 Create a vector with the given components.

 MakeVector (thePnt1, thePnt2)
 Create a torus with given radiuses at the origin of coordinate system.
def MakePrism
 Create a vector between two points.

 MakeLine (thePnt, theDir)
 Create a shape by extrusion of the base shape along a vector, defined by two points.
def MakePrismVecH
 Create a line, passing through the given point and parrallel to the given direction.

 MakeLineTwoPnt (thePnt1, thePnt2)
 Create a shape by extrusion of the base shape along the vector, i.e.
def MakePipe
 Create a line, passing through the given points.

 MakePlane (thePnt, theVec, theTrimSize)
 Create a shape by extrusion of the base shape along the path shape.
def MakeRevolution
 Create a plane, passing through the given point and normal to the given vector.

 MakePlaneThreePnt (thePnt1, thePnt2, thePnt3, theTrimSize)
 Create a shape by revolution of the base shape around the axis on the given angle, i.e.
def MakeEdge
 Create a plane, passing through the three given points.

 MakePlaneFace (theFace, theTrimSize)
 Create a linear edge with specified ends.
def MakeWire
 Create a plane, similar to the existing one, but with another size of representing face.

 MakeMarker (OX, OY, OZ, XDX, XDY, XDZ, YDX, YDY, YDZ)
 Create a wire from the set of edges and wires.
def MakeFace
 Create a local coordinate system.

 MakeMarkerPntTwoVec (theOrigin, theXVec, theYVec)
 Create a face on the given wire.
def MakeFaceWires
 Create a local coordinate system.

 MakeArc (thePnt1, thePnt2, thePnt3)
 Create a face on the given wires set.
def MakeFaces
 Create an arc of circle, passing through three given points.

 MakeCircle (thePnt, theVec, theR)
 Shortcut to MakeFaceWires().
def MakeShell
 Create a circle with given center, normal vector and radius.

 MakeCircleThreePnt (thePnt1, thePnt2, thePnt3)
 Create a shell from the set of faces and shells.
def MakeSolid
 Create a circle, passing through three given points.

 MakeEllipse (thePnt, theVec, theRMajor, theRMinor)
 Create a solid, bounded by the given shells.
def MakeCompound
 Create an ellipse with given center, normal vector and radiuses.

 MakePolyline (thePoints)
 Create a compound of the given shapes.
def NumberOfFaces
 Create a polyline on the set of points.

 MakeBezier (thePoints)
 Gives quantity of faces in the given shape.
def NumberOfEdges
 Create bezier curve on the set of points.

 MakeInterpol (thePoints)
 Gives quantity of edges in the given shape.
def ChangeOrientation
 Create B-Spline curve on the set of points.

 MakeSketcher (theCommand, theWorkingPlane=[0, 0, 0, 0, 0, 1, 1, 0, 0])
 Reverses an orientation the given shape.
def OrientationChange
 Create a sketcher (wire or face), following the textual description, passed through theCommand argument.

 MakeSketcherOnPlane (theCommand, theWorkingPlane)
 Shortcut to ChangeOrientation().
def GetFreeFacesIDs
 Create a sketcher (wire or face), following the textual description, passed through theCommand argument.

 MakeBox (x1, y1, z1, x2, y2, z2)
 Retrieve all free faces from the given shape.
def GetSharedShapes
 Create a box by coordinates of two opposite vertices.

 MakeBoxDXDYDZ (theDX, theDY, theDZ)
 Get all sub-shapes of theShape1 of the given type, shared with theShape2.
def GetShapesOnPlane
 Create a box with specified dimensions along the coordinate axes and with edges, parallel to the coordinate axes.

 MakeBoxTwoPnt (thePnt1, thePnt2)
 Find in theShape all sub-shapes of type theShapeType, situated relatively the specified plane by the certain way, defined through theState parameter.
def GetShapesOnPlaneIDs
 Create a box with two specified opposite vertices, and with edges, parallel to the coordinate axes.

 MakeCylinder (thePnt, theAxis, theR, theH)
 Works like the above method, but returns list of sub-shapes indices.
def GetShapesOnCylinder
 Create a cylinder with given base point, axis, radius and height.

 MakeCylinderRH (theR, theH)
 Find in theShape all sub-shapes of type theShapeType, situated relatively the specified cylinder by the certain way, defined through theState parameter.
def GetShapesOnCylinderIDs
 Create a cylinder with given radius and height at the origin of coordinate system.

 MakeSpherePntR (thePnt, theR)
 Works like the above method, but returns list of sub-shapes indices.
def GetShapesOnSphere
 Create a sphere with given center and radius.

 MakeSphere (x, y, z, theR)
 Find in theShape all sub-shapes of type theShapeType, situated relatively the specified sphere by the certain way, defined through theState parameter.
def GetShapesOnSphereIDs
 Create a sphere with given center and radius.

 MakeSphereR (theR)
 Works like the above method, but returns list of sub-shapes indices.
def GetShapesOnQuadrangle
 Create a sphere with given radius at the origin of coordinate system.

 MakeCone (thePnt, theAxis, theR1, theR2, theH)
 Find in theShape all sub-shapes of type theShapeType, situated relatively the specified quadrangle by the certain way, defined through theState parameter.
def GetShapesOnQuadrangleIDs
 Create a cone with given base point, axis, height and radiuses.

 MakeConeR1R2H (theR1, theR2, theH)
 Works like the above method, but returns list of sub-shapes indices.
def GetInPlace
 Create a cone with given height and radiuses at the origin of coordinate system.

 MakeTorus (thePnt, theVec, theRMajor, theRMinor)
 Get sub-shape(s) of theShapeWhere, which are coincident with theShapeWhat or could be a part of it.
def GetSubShape
 Create a torus with given center, normal vector and radiuses.

 MakeTorusRR (theRMajor, theRMinor)
 Obtain a composite sub-shape of <aShape>, composed from sub-shapes of <aShape>, selected by their unique IDs inside <aShape>.
def GetSubShapeID
 Create a torus with given radiuses at the origin of coordinate system.

 MakePrism (theBase, thePoint1, thePoint2)
 Obtain unique ID of sub-shape <aSubShape> inside <aShape>.
def SubShapeAll
 Create a shape by extrusion of the base shape along a vector, defined by two points.

 MakePrismVecH (theBase, theVec, theH)
 Explode a shape on subshapes of a given type.
def SubShapeAllIDs
 Create a shape by extrusion of the base shape along the vector, i.e.

 MakePipe (theBase, thePath)
 Explode a shape on subshapes of a given type.
def SubShapeAllSorted
 Create a shape by extrusion of the base shape along the path shape.

 MakeRevolution (theBase, theAxis, theAngle)
 Explode a shape on subshapes of a given type.
def SubShapeAllSortedIDs
 Create a shape by revolution of the base shape around the axis on the given angle, i.e.

 MakeEdge (thePnt1, thePnt2)
 Explode a shape on subshapes of a given type.
def SubShape
 Create a linear edge with specified ends.

 MakeWire (theEdgesAndWires)
 Obtain a compound of sub-shapes of <aShape>, selected by they indices in list of all sub-shapes of type <aType>.
def SubShapeSorted
 Create a wire from the set of edges and wires.

 MakeFace (theWire, isPlanarWanted)
 Obtain a compound of sub-shapes of <aShape>, selected by they indices in sorted list of all sub-shapes of type <aType>.
def ProcessShape
 Create a face on the given wire.

 MakeFaceWires (theWires, isPlanarWanted)
 Apply a sequence of Shape Healing operators to the given object.
def SuppressFaces
 Create a face on the given wires set.

 MakeFaces (theWires, isPlanarWanted)
 Remove faces from the given object (shape).
def MakeSewing
 Shortcut to MakeFaceWires().

 MakeShell (theFacesAndShells)
 Sewing of some shapes into single shape.
def Sew
 Create a shell from the set of faces and shells.

 MakeSolid (theShells)
 Sewing of the given object.
def SuppressInternalWires
 Create a solid, bounded by the given shells.

 MakeCompound (theShapes)
 Remove internal wires and edges from the given object (face).
def SuppressHoles
 Create a compound of the given shapes.

 NumberOfFaces (theShape)
 Remove internal closed contours (holes) from the given object.
def CloseContour
 Gives quantity of faces in the given shape.

 NumberOfEdges (theShape)
 Close an open wire.
def DivideEdge
 Gives quantity of edges in the given shape.

 ChangeOrientation (theShape)
 Addition of a point to a given edge object.
def GetFreeBoundary
 Reverses an orientation the given shape.

 OrientationChange (theShape)
 Get a list of wires (wrapped in GEOM_Object-s), that constitute a free boundary of the given shape.
def MakeCopy
 Shortcut to ChangeOrientation().

 GetFreeFacesIDs (theShape)
 Create a copy of the given object.
def MakeFilling
 Retrieve all free faces from the given shape.

 GetSharedShapes (theShape1, theShape2, theShapeType)
 Create a filling from the given compound of contours.
def MakeGlueFaces
 Get all sub-shapes of theShape1 of the given type, shared with theShape2.

 GetShapesOnPlane (theShape, theShapeType, theAx1, theState)
 Replace coincident faces in theShape by one face.
def MakeBoolean
 Find in theShape all sub-shapes of type theShapeType, situated relatively the specified plane by the certain way, defined through theState parameter.

 GetShapesOnPlaneIDs (theShape, theShapeType, theAx1, theState)
 Perform one of boolean operations on two given shapes.
def MakeCommon
 Works like the above method, but returns list of sub-shapes indices.

 GetShapesOnCylinder (theShape, theShapeType, theAxis, theRadius, theState)
 Shortcut to MakeBoolean(s1, s2, 1).
def MakeCut
 Find in theShape all sub-shapes of type theShapeType, situated relatively the specified cylinder by the certain way, defined through theState parameter.

 GetShapesOnCylinderIDs (theShape, theShapeType, theAxis, theRadius, theState)
 Shortcut to MakeBoolean(s1, s2, 2).
def MakeFuse
 Works like the above method, but returns list of sub-shapes indices.

 GetShapesOnSphere (theShape, theShapeType, theCenter, theRadius, theState)
 Shortcut to MakeBoolean(s1, s2, 3).
def MakeSection
 Find in theShape all sub-shapes of type theShapeType, situated relatively the specified sphere by the certain way, defined through theState parameter.

 GetShapesOnSphereIDs (theShape, theShapeType, theCenter, theRadius, theState)
 Shortcut to MakeBoolean(s1, s2, 4).
def MakePartition
 Works like the above method, but returns list of sub-shapes indices.

 GetShapesOnQuadrangle (theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState)
 Perform partition operation.
def Partition
 Find in theShape all sub-shapes of type theShapeType, situated relatively the specified quadrangle by the certain way, defined through theState parameter.

 GetShapesOnQuadrangleIDs (theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState)
 Shortcut to MakePartition().
def MakeHalfPartition
 Works like the above method, but returns list of sub-shapes indices.

 GetInPlace (theShapeWhere, theShapeWhat)
 Perform partition of the Shape with the Plane.
def MakeTranslationTwoPoints
 Get sub-shape(s) of theShapeWhere, which are coincident with theShapeWhat or could be a part of it.

 GetSubShape (aShape, ListOfID)
 Translate the given object along the vector, specified by its end points, creating its copy before the translation.
def MakeTranslation
 Obtain a composite sub-shape of <ashape>, composed from sub-shapes of <ashape>, selected by their unique IDs inside <ashape>.

 GetSubShapeID (aShape, aSubShape)
 Translate the given object along the vector, specified by its components, creating its copy before the translation.
def MakeTranslationVector
 Obtain unique ID of sub-shape <asubshape> inside <ashape>.

 SubShapeAll (aShape, aType)
 Translate the given object along the given vector, creating its copy before the translation.
def MakeRotation
 Explode a shape on subshapes of a given type.

 SubShapeAllIDs (aShape, aType)
 Rotate the given object around the given axis on the given angle, creating its copy before the rotatation.
def MakeScaleTransform
 Explode a shape on subshapes of a given type.

 SubShapeAllSorted (aShape, aType)
 Scale the given object by the factor, creating its copy before the scaling.
def MakeMirrorByPlane
 Explode a shape on subshapes of a given type.

 SubShapeAllSortedIDs (aShape, aType)
 Create an object, symmetrical to the given one relatively the given plane.
def MakeMirrorByAxis
 Explode a shape on subshapes of a given type.

 SubShape (aShape, aType, ListOfInd)
 Create an object, symmetrical to the given one relatively the given axis.
def MakeMirrorByPoint
 Obtain a compound of sub-shapes of <ashape>, selected by they indices in list of all sub-shapes of type <atype>.

 SubShapeSorted (aShape, aType, ListOfInd)
 Create an object, symmetrical to the given one relatively the given point.
def MakePosition
 Obtain a compound of sub-shapes of <ashape>, selected by they indices in sorted list of all sub-shapes of type <atype>.

 ProcessShape (theShape, theOperators, theParameters, theValues)
 Modify the Location of the given object by LCS creating its copy before the setting.
def MakeOffset
 Apply a sequence of Shape Healing operators to the given object.

 SuppressFaces (theObject, theFaces)
 Create new object as offset of the given one.
def MakeMultiTranslation1D
 Remove faces from the given object (shape).

 MakeSewing (ListShape, theTolerance)
 Translate the given object along the given vector a given number times.
def MakeMultiTranslation2D
 Sewing of some shapes into single shape.

 Sew (theObject, theTolerance)
 Conseqently apply two specified translations to theObject specified number of times.
def MultiRotate1D
 Sewing of the given object.

 SuppressInternalWires (theObject, theWires)
 Rotate the given object around the given axis a given number times.
def MultiRotate2D
 Remove internal wires and edges from the given object (face).

 SuppressHoles (theObject, theWires)
 Rotate the given object around the given axis on the given angle a given number times and multi-translate each rotation result.
def MakeMultiRotation1D
 Remove internal closed contours (holes) from the given object.

 CloseContour (theObject, theWires, isCommonVertex)
 The same, as MultiRotate1D(), but axis is given by direction and point.
def MakeMultiRotation2D
 Close an open wire.

 DivideEdge (theObject, theEdgeIndex, theValue, isByParameter)
 The same, as MultiRotate2D(), but axis is given by direction and point.
def MakeFilletAll
 Addition of a point to a given edge object.

 GetFreeBoundary (theObject)
 Perform a fillet on all edges of the given shape.
def MakeFillet
 Get a list of wires (wrapped in GEOM_Object-s), that constitute a free boundary of the given shape.

 MakeCopy (theOriginal)
 Perform a fillet on the specified edges/faces of the given shape.
def MakeChamferAll
 Create a copy of the given object.

 MakeFilling (theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter)
 Perform a symmetric chamfer on all edges of the given shape.
def MakeChamferEdge
 Create a filling from the given compound of contours.

 MakeGlueFaces (theShape, theTolerance)
 Perform a chamfer on edges, common to the specified faces, with distance D1 on the Face1.
def MakeChamferFaces
 Replace coincident faces in theShape by one face.

 MakeBoolean (theShape1, theShape2, theOperation)
 Perform a chamfer on all edges of the specified faces, with distance D1 on the first specified face (if several for one edge).
def MakeChamfer
 Perform one of boolean operations on two given shapes.

 MakeCommon (s1, s2)
 Shortcut to MakeChamferEdge() and MakeChamferFaces().
def Archimede
 Shortcut to MakeBoolean(s1, s2, 1).

 MakeCut (s1, s2)
 Perform an Archimde operation on the given shape with given parameters.
def PointCoordinates
 Shortcut to MakeBoolean(s1, s2, 2).

 MakeFuse (s1, s2)
 Get point coordinates.
def BasicProperties
 Shortcut to MakeBoolean(s1, s2, 3).

 MakeSection (s1, s2)
 Get summarized length of all wires, area of surface and volume of the given shape.
def BoundingBox
 Shortcut to MakeBoolean(s1, s2, 4).

 MakePartition (ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[], Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[])
 Get parameters of bounding box of the given shape.
def Inertia
 Perform partition operation.

 Partition (ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[], Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[])
 Get inertia matrix and moments of inertia of theShape.
def MinDistance
 Shortcut to MakePartition().

 MakeHalfPartition (theShape, thePlane)
 Get minimal distance between the given shapes.
def Tolerance
 Perform partition of the Shape with the Plane.

 MakeTranslationTwoPoints (theObject, thePoint1, thePoint2)
 Get min and max tolerances of sub-shapes of theShape.
def WhatIs
 Translate the given object along the vector, specified by its end points, creating its copy before the translation.

 MakeTranslation (theObject, theDX, theDY, theDZ)
 Obtain description of the given shape (number of sub-shapes of each type).
def MakeCDG
 Translate the given object along the vector, specified by its components, creating its copy before the translation.

 MakeTranslationVector (theObject, theVector)
 Get a point, situated at the centre of mass of theShape.
def CheckShape
 Translate the given object along the given vector, creating its copy before the translation.

 MakeRotation (theObject, theAxis, theAngle)
 Check a topology of the given shape.
def Import
 Rotate the given object around the given axis on the given angle, creating its copy before the rotatation.

 MakeScaleTransform (theObject, thePoint, theFactor)
 Import a shape from the BREP or IGES or STEP file (depends on given format) with given name.
def ImportBREP
 Scale the given object by the factor, creating its copy before the scaling.

 MakeMirrorByPlane (theObject, thePlane)
 Shortcut to Import() for BREP format.
def ImportIGES
 Create an object, symmetrical to the given one relatively the given plane.

 MakeMirrorByAxis (theObject, theAxis)
 Shortcut to Import() for IGES format.
def ImportSTEP
 Create an object, symmetrical to the given one relatively the given axis.

 MakeMirrorByPoint (theObject, thePoint)
 Shortcut to Import() for STEP format.
def Export
 Create an object, symmetrical to the given one relatively the given point.

 MakePosition (theObject, theStartLCS, theEndLCS)
 Export the given shape into a file with given name.
def ExportBREP
 Modify the Location of the given object by LCS creating its copy before the setting.

 MakeOffset (theObject, theOffset)
 Shortcut to Export() for BREP format.
def ExportIGES
 Create new object as offset of the given one.

 MakeMultiTranslation1D (theObject, theVector, theStep, theNbTimes)
 Shortcut to Export() for IGES format.
def ExportSTEP
 Translate the given object along the given vector a given number times.

 MakeMultiTranslation2D (theObject, theVector1, theStep1, theNbTimes1, theVector2, theStep2, theNbTimes2)
 Shortcut to Export() for STEP format.
def MakeQuad
 Conseqently apply two specified translations to theObject specified number of times.

 MultiRotate1D (theObject, theAxis, theNbTimes)
 Create a quadrangle face from four edges.
def MakeQuad2Edges
 Rotate the given object around the given axis a given number times.

 MultiRotate2D (theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2)
 Create a quadrangle face on two edges.
def MakeQuad4Vertices
 Rotate the given object around the given axis on the given angle a given number times and multi-translate each rotation result.

 MakeMultiRotation1D (aShape, aDir, aPoint, aNbTimes)
 Create a quadrangle face with specified corners.
def MakeHexa
 The same, as MultiRotate1D(), but axis is given by direction and point.

 MakeMultiRotation2D (aShape, aDir, aPoint, anAngle, nbtimes1, aStep, nbtimes2)
 Create a hexahedral solid, bounded by the six given faces.
def MakeHexa2Faces
 The same, as MultiRotate2D(), but axis is given by direction and point.

 MakeFilletAll (theShape, theR)
 Create a hexahedral solid between two given faces.
def GetPoint
 Perform a fillet on all edges of the given shape.

 MakeFillet (theShape, theR, theShapeType, theListShapes)
 Get a vertex, found in the given shape by its coordinates.
def GetEdge
 Perform a fillet on the specified edges/faces of the given shape.

 MakeChamferAll (theShape, theD)
 Get an edge, found in the given shape by two given vertices.
def GetEdgeNearPoint
 Perform a symmetric chamfer on all edges of the given shape.

 MakeChamferEdge (theShape, theD1, theD2, theFace1, theFace2)
 Find an edge of the given shape, which has minimal distance to the given point.
def GetFaceByPoints
 Perform a chamfer on edges, common to the specified faces, with distance D1 on the Face1.

 MakeChamferFaces (theShape, theD1, theD2, theFaces)
 Returns a face, found in the given shape by four given corner vertices.
def GetFaceByEdges
 Perform a chamfer on all edges of the specified faces, with distance D1 on the first specified face (if several for one edge).

 MakeChamfer (aShape, d1, d2, aShapeType, ListShape)
 Get a face of block, found in the given shape by two given edges.
def GetOppositeFace
 Shortcut to MakeChamferEdge() and MakeChamferFaces().

 Archimede (theShape, theWeight, theWaterDensity, theMeshDeflection)
 Find a face, opposite to the given one in the given block.
def GetFaceNearPoint
 Perform an Archimde operation on the given shape with given parameters.

 PointCoordinates (Point)
 Find a face of the given shape, which has minimal distance to the given point.
def GetFaceByNormale
 Get point coordinates.

 BasicProperties (theShape)
 Find a face of block, whose outside normale has minimal angle with the given vector.
def CheckCompoundOfBlocks
 Get summarized length of all wires, area of surface and volume of the given shape.

 BoundingBox (theShape)
 Check, if the compound of blocks is given.
def RemoveExtraEdges
 Get parameters of bounding box of the given shape.

 Inertia (theShape)
 Remove all seam and degenerated edges from theShape.
def CheckAndImprove
 Get inertia matrix and moments of inertia of theShape.

 MinDistance (theShape1, theShape2)
 Check, if the given shape is a blocks compound.
def MakeBlockExplode
 Get minimal distance between the given shapes.

 Tolerance (theShape)
 Get all the blocks, contained in the given compound.
def GetBlockNearPoint
 Get min and max tolerances of sub-shapes of theShape.

 WhatIs (theShape)
 Find block, containing the given point inside its volume or on boundary.
def GetBlockByParts
 Obtain description of the given shape (number of sub-shapes of each type).

 MakeCDG (theShape)
 Find block, containing all the elements, passed as the parts, or maximum quantity of them.
def GetBlocksByParts
 Get a point, situated at the centre of mass of theShape.

 CheckShape (theShape)
 Return all blocks, containing all the elements, passed as the parts.
def MakeMultiTransformation1D
 Check a topology of the given shape.

 Import (theFileName, theFormatName)
 Multi-transformate block and glue the result.
def MakeMultiTransformation2D
 Import a shape from the BREP or IGES or STEP file (depends on given format) with given name.

 ImportBREP (theFileName)
 Multi-transformate block and glue the result.
def Propagate
 Shortcut to Import() for BREP format.

 ImportIGES (theFileName)
 Build all possible propagation groups.
def CreateGroup
 Shortcut to Import() for IGES format.

 ImportSTEP (theFileName)
 Creates a new group which will store sub shapes of theMainShape.
def AddObject
 Shortcut to Import() for STEP format.

 Export (theObject, theFileName, theFormatName)
 Adds a sub object with ID theSubShapeId to the group.
def RemoveObject
 Export the given shape into a file with given name.

 ExportBREP (theObject, theFileName)
 Removes a sub object with ID theSubShapeId from the group.
def UnionList
 Shortcut to Export() for BREP format.

 ExportIGES (theObject, theFileName)
 Adds to the group all the given shapes.
def UnionIDs
 Shortcut to Export() for IGES format.

 ExportSTEP (theObject, theFileName)
 Works like the above method, but argument theSubShapes here is a list of sub-shapes indices.
def DifferenceList
 Shortcut to Export() for STEP format.

 MakeQuad (E1, E2, E3, E4)
 Removes from the group all the given shapes.
def DifferenceIDs
 Create a quadrangle face from four edges.

 MakeQuad2Edges (E1, E2)
 Works like the above method, but argument theSubShapes here is a list of sub-shapes indices.
def GetObjectIDs
 Create a quadrangle face on two edges.

 MakeQuad4Vertices (V1, V2, V3, V4)
 Returns a list of sub objects ID stored in the group.
def GetType
 Create a quadrangle face with specified corners.

 MakeHexa (F1, F2, F3, F4, F5, F6)
 Returns a type of sub objects stored in the group.
def GetMainShape
 Create a hexahedral solid, bounded by the six given faces.

 MakeHexa2Faces (F1, F2)
 Returns a main shape associated with the group.
def GetEdgesByLength
 Create a hexahedral solid between two given faces.

 GetPoint (theShape, theX, theY, theZ, theEpsilon)
def SelectEdges
 Get a vertex, found in the given shape by its coordinates.

 GetEdge (theShape, thePoint1, thePoint2)
def addPath
 Get an edge, found in the given shape by two given vertices.

 GetEdgeNearPoint (theShape, thePoint)
 Add Path to load python scripts from.

Variables

tuple g = lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 Find an edge of the given shape, which has minimal distance to the given point.

 GetFaceByPoints (theShape, thePoint1, thePoint2, thePoint3, thePoint4)
tuple geom = g._narrow( GEOM.GEOM_Gen )
 Returns a face, found in the given shape by four given corner vertices.

 GetFaceByEdges (theShape, theEdge1, theEdge2)
 myBuilder = None
 Get a face of block, found in the given shape by two given edges.

 GetOppositeFace (theBlock, theFace)
int myStudyId = 0
 Find a face, opposite to the given one in the given block.

 GetFaceNearPoint (theShape, thePoint)
 father = None
 Find a face of the given shape, which has minimal distance to the given point.

 GetFaceByNormale (theBlock, theVector)
 BasicOp = None
 Find a face of block, whose outside normale has minimal angle with the given vector.

 CheckCompoundOfBlocks (theCompound)
 CurvesOp = None
 Check, if the compound of blocks is given.

 RemoveExtraEdges (theShape)
 PrimOp = None
 Remove all seam and degenerated edges from theShape.

 CheckAndImprove (theShape)
 ShapesOp = None
 Check, if the given shape is a blocks compound.

 MakeBlockExplode (theCompound, theMinNbFaces, theMaxNbFaces)
 HealOp = None
 Get all the blocks, contained in the given compound.

 GetBlockNearPoint (theCompound, thePoint)
 InsertOp = None
 Find block, containing the given point inside its volume or on boundary.

 GetBlockByParts (theCompound, theParts)
 BoolOp = None
 Find block, containing all the elements, passed as the parts, or maximum quantity of them.

 GetBlocksByParts (theCompound, theParts)
 TrsfOp = None
 Return all blocks, containing all the elements, passed as the parts.

 MakeMultiTransformation1D (Block, DirFace1, DirFace2, NbTimes)
 LocalOp = None
 Multi-transformate block and glue the result.

 MakeMultiTransformation2D (Block, DirFace1U, DirFace2U, NbTimesU, DirFace1V, DirFace2V, NbTimesV)
 MeasuOp = None
 Multi-transformate block and glue the result.

 Propagate (theShape)
 BlocksOp = None
 Build all possible propagation groups.

 CreateGroup (theMainShape, theShapeType)
 GroupOp = None
 Creates a new group which will store sub shapes of theMainShape.

 AddObject (theGroup, theSubShapeID)
dictionary ShapeType = {"COMPOUND":0, "COMPSOLID":1, "SOLID":2, "SHELL":3, "FACE":4, "WIRE":5, "EDGE":6, "VERTEX":7, "SHAPE":8}
 Adds a sub object with ID theSubShapeId to the group.

 RemoveObject (theGroup, theSubShapeID)
tuple g = lcc.FindOrLoadComponent("FactoryServer", "GEOM")
 Removes a sub object with ID theSubShapeId from the group.

 UnionList (theGroup, theSubShapes)
tuple geom = g._narrow( GEOM.GEOM_Gen )
 Adds to the group all the given shapes.

 UnionIDs (theGroup, theSubShapes)
 myBuilder = None
 Works like the above method, but argument theSubShapes here is a list of sub-shapes indices.

 DifferenceList (theGroup, theSubShapes)
int myStudyId = 0
 Removes from the group all the given shapes.

 DifferenceIDs (theGroup, theSubShapes)
 father = None
 Works like the above method, but argument theSubShapes here is a list of sub-shapes indices.

 GetObjectIDs (theGroup)
 BasicOp = None
 Returns a list of sub objects ID stored in the group.

 GetType (theGroup)
 CurvesOp = None
 Returns a type of sub objects stored in the group.

 GetMainShape (theGroup)
 PrimOp = None
 Returns a main shape associated with the group.

 GetEdgesByLength (theShape, min_length, max_length, include_min=1, include_max=1)
 ShapesOp = None
 Create group of edges of theShape, whose length is in range [min_length, max_length].

 SelectEdges (min_length, max_length, include_min=1, include_max=1)
 HealOp = None
 Create group of edges of selected shape, whose length is in range [min_length, max_length].

 addPath (Path)
 InsertOp = None
 BoolOp = None
 TrsfOp = None
 LocalOp = None
 MeasuOp = None
 BlocksOp = None
 GroupOp = None
dictionary ShapeType = {"COMPOUND":0, "COMPSOLID":1, "SOLID":2, "SHELL":3, "FACE":4, "WIRE":5, "EDGE":6, "VERTEX":7, "SHAPE":8}
 Add Path to load python scripts from.

Function Documentation

-

- +

+

- + - - + + @@ -544,7 +609,7 @@
init_geom def geompy::init_geom ( theStudy    theStudy  ) 
- +
  @@ -555,25 +620,25 @@
-

- +

+

- + - - + + - - - + + + - + @@ -581,7 +646,7 @@
SubShapeName def geompy::SubShapeName ( aSubObj ,   aSubObj,
aMainObj   aMainObj
) 
- +
  @@ -592,25 +657,25 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -618,7 +683,7 @@ Example: see GEOM_TestAll.py
addToStudy def geompy::addToStudy ( aShape ,   aShape,
aName   aName
) 
- +
Example: see GEOM_TestAll.py
  @@ -629,31 +694,31 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -661,7 +726,7 @@ Example: see GEOM_TestAll.py
addToStudyInFather def geompy::addToStudyInFather ( aFather ,   aFather,
aShape ,   aShape,
aName   aName
) 
- +
Example: see GEOM_TestAll.py
  @@ -672,31 +737,31 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -704,7 +769,7 @@ Example: see GEOM_TestAll.py
MakeVertex def geompy::MakeVertex ( theX ,   theX,
theY ,   theY,
theZ   theZ
) 
- +

Parameters:
  @@ -714,46 +779,46 @@ Example: see GEOM_TestAll.py
- - - + + +
theX The X coordinate of the point.
theY The Y coordinate of the point.
theZ The Z coordinate of the point.
theX The X coordinate of the point.
theY The Y coordinate of the point.
theZ The Z coordinate of the point.
Returns:
New GEOM_Object, containing the created point.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -761,7 +826,7 @@ Example: see GEOM_TestAll.py
MakeVertexWithRef def geompy::MakeVertexWithRef ( theReference ,   theReference,
theX ,   theX,
theY ,   theY,
theZ   theZ
) 
- +

Parameters:
  @@ -771,35 +836,35 @@ Example: see GEOM_TestAll.py
- - - - + + + +
theReference The referenced point.
theX Displacement from the referenced point along OX axis.
theY Displacement from the referenced point along OY axis.
theZ Displacement from the referenced point along OZ axis.
theReference The referenced point.
theX Displacement from the referenced point along OX axis.
theY Displacement from the referenced point along OY axis.
theZ Displacement from the referenced point along OZ axis.
Returns:
New GEOM_Object, containing the created point.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -807,7 +872,7 @@ Example: see GEOM_TestAll.py
MakeVertexOnCurve def geompy::MakeVertexOnCurve ( theRefCurve ,   theRefCurve,
theParameter   theParameter
) 
- +

Parameters:
  @@ -817,39 +882,39 @@ Example: see GEOM_TestAll.py
- - + +
theRefCurve The referenced curve.
theParameter Value of parameter on the referenced curve.
theRefCurve The referenced curve.
theParameter Value of parameter on the referenced curve.
Returns:
New GEOM_Object, containing the created point.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -857,7 +922,7 @@ Example: see GEOM_TestAll.py
MakeVectorDXDYDZ def geompy::MakeVectorDXDYDZ ( theDX ,   theDX,
theDY ,   theDY,
theDZ   theDZ
) 
- +

Parameters:
  @@ -867,34 +932,34 @@ Example: see GEOM_TestAll.py
- - - + + +
theDX X component of the vector.
theDY Y component of the vector.
theDZ Z component of the vector.
theDX X component of the vector.
theDY Y component of the vector.
theDZ Z component of the vector.
Returns:
New GEOM_Object, containing the created vector.
Example: see GEOM_TestAll.py
-

- +

+

+
Returns:
New GEOM_Object, containing the created vector.
+
- + - - + + - - - + + + - + @@ -902,7 +967,7 @@ Example: see GEOM_TestAll.py
MakeVector def geompy::MakeVector ( thePnt1 ,   thePnt1,
thePnt2   thePnt2
) 
- +

Parameters:
  @@ -912,33 +977,33 @@ Example: see GEOM_TestAll.py
- - + +
thePnt1 Start point for the vector.
thePnt2 End point for the vector.
thePnt1 Start point for the vector.
thePnt2 End point for the vector.
-
Returns:
New GEOM_Object, containing the created vector.
-Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -946,7 +1011,7 @@ Example: see GEOM_TestAll.py
MakeLine def geompy::MakeLine ( thePnt ,   thePnt,
theDir   theDir
) 
- +

Parameters:
  @@ -956,33 +1021,33 @@ Example: see GEOM_TestAll.py
- - + +
thePnt Point. The resulting line will pass through it.
theDir Direction. The resulting line will be parallel to it.
thePnt Point. The resulting line will pass through it.
theDir Direction. The resulting line will be parallel to it.
Returns:
New GEOM_Object, containing the created line.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -990,7 +1055,7 @@ Example: see GEOM_TestAll.py
MakeLineTwoPnt def geompy::MakeLineTwoPnt ( thePnt1 ,   thePnt1,
thePnt2   thePnt2
) 
- +

Parameters:
  @@ -1000,39 +1065,39 @@ Example: see GEOM_TestAll.py
- - + +
thePnt1 First of two points, defining the line.
thePnt2 Second of two points, defining the line.
thePnt1 First of two points, defining the line.
thePnt2 Second of two points, defining the line.
Returns:
New GEOM_Object, containing the created line.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -1040,7 +1105,7 @@ Example: see GEOM_TestAll.py
MakePlane def geompy::MakePlane ( thePnt ,   thePnt,
theVec ,   theVec,
theTrimSize   theTrimSize
) 
- +

Parameters:
  @@ -1050,46 +1115,46 @@ Example: see GEOM_TestAll.py
- - - + + +
thePnt Point, the plane has to pass through.
theVec Vector, defining the plane normal direction.
theTrimSize Half size of a side of quadrangle face, representing the plane.
thePnt Point, the plane has to pass through.
theVec Vector, defining the plane normal direction.
theTrimSize Half size of a side of quadrangle face, representing the plane.
Returns:
New GEOM_Object, containing the created plane.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -1097,7 +1162,7 @@ Example: see GEOM_TestAll.py
MakePlaneThreePnt def geompy::MakePlaneThreePnt ( thePnt1 ,   thePnt1,
thePnt2 ,   thePnt2,
thePnt3 ,   thePnt3,
theTrimSize   theTrimSize
) 
- +

Parameters:
  @@ -1107,35 +1172,35 @@ Example: see GEOM_TestAll.py
- - - - + + + +
thePnt1 First of three points, defining the plane.
thePnt2 Second of three points, defining the plane.
thePnt3 Fird of three points, defining the plane.
theTrimSize Half size of a side of quadrangle face, representing the plane.
thePnt1 First of three points, defining the plane.
thePnt2 Second of three points, defining the plane.
thePnt3 Fird of three points, defining the plane.
theTrimSize Half size of a side of quadrangle face, representing the plane.
Returns:
New GEOM_Object, containing the created plane.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -1143,7 +1208,7 @@ Example: see GEOM_TestAll.py
MakePlaneFace def geompy::MakePlaneFace ( theFace ,   theFace,
theTrimSize   theTrimSize
) 
- +

Parameters:
  @@ -1153,75 +1218,75 @@ Example: see GEOM_TestAll.py
- - + +
theFace Referenced plane.
theTrimSize New half size of a side of quadrangle face, representing the plane.
theFace Referenced plane.
theTrimSize New half size of a side of quadrangle face, representing the plane.
Returns:
New GEOM_Object, containing the created plane.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -1229,7 +1294,7 @@ Example: see GEOM_TestAll.py
MakeMarker def geompy::MakeMarker ( OX ,   OX,
OY ,   OY,
OZ ,   OZ,
XDX ,   XDX,
XDY ,   XDY,
XDZ ,   XDZ,
YDX ,   YDX,
YDY ,   YDY,
YDZ   YDZ
) 
- +

Parameters:
  @@ -1239,40 +1304,40 @@ Example: see GEOM_TestAll.py
- - - + + +
OX,OY,OZ Three coordinates of coordinate system origin.
XDX,XDY,XDZ Three components of OX direction
YDX,YDY,YDZ Three components of OY direction
OX,OY,OZ Three coordinates of coordinate system origin.
XDX,XDY,XDZ Three components of OX direction
YDX,YDY,YDZ Three components of OY direction
Returns:
New GEOM_Object, containing the created coordinate system.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -1280,7 +1345,7 @@ Example: see GEOM_TestAll.py
MakeMarkerPntTwoVec def geompy::MakeMarkerPntTwoVec ( theOrigin ,   theOrigin,
theXVec ,   theXVec,
theYVec   theYVec
) 
- +

Parameters:
  @@ -1290,40 +1355,40 @@ Example: see GEOM_TestAll.py
- - - + + +
theOrigin Point of coordinate system origin.
theXVec Vector of X direction
theYVec Vector of Y direction
theOrigin Point of coordinate system origin.
theXVec Vector of X direction
theYVec Vector of Y direction
Returns:
New GEOM_Object, containing the created coordinate system.
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -1331,7 +1396,7 @@ Example: see GEOM_TestAll.py
MakeArc def geompy::MakeArc ( thePnt1 ,   thePnt1,
thePnt2 ,   thePnt2,
thePnt3   thePnt3
) 
- +

Parameters:
  @@ -1341,40 +1406,40 @@ Example: see GEOM_TestAll.py
- - - + + +
thePnt1 Start point of the arc.
thePnt2 Middle point of the arc.
thePnt3 End point of the arc.
thePnt1 Start point of the arc.
thePnt2 Middle point of the arc.
thePnt3 End point of the arc.
Returns:
New GEOM_Object, containing the created arc.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -1382,7 +1447,7 @@ Example: see GEOM_TestAll.py
MakeCircle def geompy::MakeCircle ( thePnt ,   thePnt,
theVec ,   theVec,
theR   theR
) 
- +

Parameters:
  @@ -1392,40 +1457,40 @@ Example: see GEOM_TestAll.py
- - - + + +
thePnt Circle center.
theVec Vector, normal to the plane of the circle.
theR Circle radius.
thePnt Circle center.
theVec Vector, normal to the plane of the circle.
theR Circle radius.
Returns:
New GEOM_Object, containing the created circle.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -1433,7 +1498,7 @@ Example: see GEOM_TestAll.py
MakeCircleThreePnt def geompy::MakeCircleThreePnt ( thePnt1 ,   thePnt1,
thePnt2 ,   thePnt2,
thePnt3   thePnt3
) 
- +

Parameters:
  @@ -1443,44 +1508,44 @@ Example: see GEOM_TestAll.py
- +
thePnt1,thePnt2,thePnt3 Points, defining the circle.
thePnt1,thePnt2,thePnt3 Points, defining the circle.
Returns:
New GEOM_Object, containing the created circle.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -1488,7 +1553,7 @@ Example: see GEOM_TestAll.py
MakeEllipse def geompy::MakeEllipse ( thePnt ,   thePnt,
theVec ,   theVec,
theRMajor ,   theRMajor,
theRMinor   theRMinor
) 
- +

Parameters:
  @@ -1498,26 +1563,26 @@ Example: see GEOM_TestAll.py
- - - - + + + +
thePnt Ellipse center.
theVec Vector, normal to the plane of the ellipse.
theRMajor Major ellipse radius.
theRMinor Minor ellipse radius.
thePnt Ellipse center.
theVec Vector, normal to the plane of the ellipse.
theRMajor Major ellipse radius.
theRMinor Minor ellipse radius.
Returns:
New GEOM_Object, containing the created ellipse.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -1525,7 +1590,7 @@ Example: see GEOM_TestAll.py
MakePolyline def geompy::MakePolyline ( thePoints    thePoints  ) 
- +

Parameters:
  @@ -1535,23 +1600,23 @@ Example: see GEOM_TestAll.py
- +
thePoints Sequence of points for the polyline.
thePoints Sequence of points for the polyline.
Returns:
New GEOM_Object, containing the created polyline.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -1559,7 +1624,7 @@ Example: see GEOM_TestAll.py
MakeBezier def geompy::MakeBezier ( thePoints    thePoints  ) 
- +

Parameters:
  @@ -1569,23 +1634,23 @@ Example: see GEOM_TestAll.py
- +
thePoints Sequence of points for the bezier curve.
thePoints Sequence of points for the bezier curve.
Returns:
New GEOM_Object, containing the created bezier curve.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -1593,7 +1658,7 @@ Example: see GEOM_TestAll.py
MakeInterpol def geompy::MakeInterpol ( thePoints    thePoints  ) 
- +

Parameters:
  @@ -1603,80 +1668,32 @@ Example: see GEOM_TestAll.py
- +
thePoints Sequence of points for the B-Spline curve.
thePoints Sequence of points for the B-Spline curve.
Returns:
New GEOM_Object, containing the created B-Spline curve.
Example: see GEOM_TestAll.py
-

- +

+

- + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - + + + - + @@ -1684,7 +1701,7 @@ Example: see GEOM_TestAll.py
MakeSketcher def geompy::MakeSketcher ( theCommand ,
theWorkingPlane  = [0,
0 ,
0 ,
0 ,
0 ,
1 ,
1 ,
0 ,   theCommand,
0]   theWorkingPlane = [0
) 
- +
  @@ -1712,33 +1729,33 @@ Where:

    Parameters:
    - - + +
    theCommand String, defining the sketcher in local coordinates of the working plane.
    theWorkingPlane Nine double values, defining origin, OZ and OX directions of the working plane.
    theCommand String, defining the sketcher in local coordinates of the working plane.
    theWorkingPlane Nine double values, defining origin, OZ and OX directions of the working plane.
    Returns:
    New GEOM_Object, containing the created wire.
    Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -1746,7 +1763,7 @@ Example: see GEOM_TestAll.py
MakeSketcherOnPlane def geompy::MakeSketcherOnPlane ( theCommand ,   theCommand,
theWorkingPlane   theWorkingPlane
) 
- +
For format of the description string see the previous method.
Parameters:
  @@ -1758,57 +1775,57 @@ Example: see GEOM_TestAll.py
- - + +
theCommand String, defining the sketcher in local coordinates of the working plane.
theWorkingPlane Planar Face of the working plane.
theCommand String, defining the sketcher in local coordinates of the working plane.
theWorkingPlane Planar Face of the working plane.
Returns:
New GEOM_Object, containing the created wire.
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -1816,7 +1833,7 @@ Example: see GEOM_TestAll.py
MakeBox def geompy::MakeBox ( x1 ,   x1,
y1 ,   y1,
z1 ,   z1,
x2 ,   x2,
y2 ,   y2,
z2   z2
) 
- +
Example: see GEOM_TestAll.py
  @@ -1827,31 +1844,31 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -1859,7 +1876,7 @@ Example: see GEOM_TestAll.py
MakeBoxDXDYDZ def geompy::MakeBoxDXDYDZ ( theDX ,   theDX,
theDY ,   theDY,
theDZ   theDZ
) 
- +

Center of the box will be at point (DX/2, DY/2, DZ/2).

Parameters:
  @@ -1869,34 +1886,34 @@ Example: see GEOM_TestAll.py
- - - + + +
theDX Length of Box edges, parallel to OX axis.
theDY Length of Box edges, parallel to OY axis.
theDZ Length of Box edges, parallel to OZ axis.
theDX Length of Box edges, parallel to OX axis.
theDY Length of Box edges, parallel to OY axis.
theDZ Length of Box edges, parallel to OZ axis.
Returns:
New GEOM_Object, containing the created box.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -1904,7 +1921,7 @@ Example: see GEOM_TestAll.py
MakeBoxTwoPnt def geompy::MakeBoxTwoPnt ( thePnt1 ,   thePnt1,
thePnt2   thePnt2
) 
- +

Parameters:
  @@ -1914,45 +1931,45 @@ Example: see GEOM_TestAll.py
- - + +
thePnt1 First of two opposite vertices.
thePnt2 Second of two opposite vertices.
thePnt1 First of two opposite vertices.
thePnt2 Second of two opposite vertices.
Returns:
New GEOM_Object, containing the created box.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -1960,7 +1977,7 @@ Example: see GEOM_TestAll.py
MakeCylinder def geompy::MakeCylinder ( thePnt ,   thePnt,
theAxis ,   theAxis,
theR ,   theR,
theH   theH
) 
- +

Parameters:
  @@ -1970,35 +1987,35 @@ Example: see GEOM_TestAll.py
- - - - + + + +
thePnt Central point of cylinder base.
theAxis Cylinder axis.
theR Cylinder radius.
theH Cylinder height.
thePnt Central point of cylinder base.
theAxis Cylinder axis.
theR Cylinder radius.
theH Cylinder height.
Returns:
New GEOM_Object, containing the created cylinder.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -2006,7 +2023,7 @@ Example: see GEOM_TestAll.py
MakeCylinderRH def geompy::MakeCylinderRH ( theR ,   theR,
theH   theH
) 
- +

Axis of the cylinder will be collinear to the OZ axis of the coordinate system.

Parameters:
  @@ -2016,33 +2033,33 @@ Example: see GEOM_TestAll.py
- - + +
theR Cylinder radius.
theH Cylinder height.
theR Cylinder radius.
theH Cylinder height.
Returns:
New GEOM_Object, containing the created cylinder.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -2050,7 +2067,7 @@ Example: see GEOM_TestAll.py
MakeSpherePntR def geompy::MakeSpherePntR ( thePnt ,   thePnt,
theR   theR
) 
- +

Parameters:
  @@ -2060,45 +2077,45 @@ Example: see GEOM_TestAll.py
- - + +
thePnt Sphere center.
theR Sphere radius.
thePnt Sphere center.
theR Sphere radius.
Returns:
New GEOM_Object, containing the created sphere.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -2106,7 +2123,7 @@ Example: see GEOM_TestAll.py
MakeSphere def geompy::MakeSphere ( x ,   x,
y ,   y,
z ,   z,
theR   theR
) 
- +

Parameters:
  @@ -2116,24 +2133,24 @@ Example: see GEOM_TestAll.py
- - + +
x,y,z Coordinates of sphere center.
theR Sphere radius.
x,y,z Coordinates of sphere center.
theR Sphere radius.
Returns:
New GEOM_Object, containing the created sphere.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -2141,7 +2158,7 @@ Example: see GEOM_TestAll.py
MakeSphereR def geompy::MakeSphereR ( theR    theR  ) 
- +

Parameters:
  @@ -2151,50 +2168,50 @@ Example: see GEOM_TestAll.py
- +
theR Sphere radius.
theR Sphere radius.
Returns:
New GEOM_Object, containing the created sphere.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -2202,7 +2219,7 @@ Example: see GEOM_TestAll.py
MakeCone def geompy::MakeCone ( thePnt ,   thePnt,
theAxis ,   theAxis,
theR1 ,   theR1,
theR2 ,   theR2,
theH   theH
) 
- +

Parameters:
  @@ -2212,48 +2229,48 @@ Example: see GEOM_TestAll.py
- - - - + + + +
thePnt Central point of the first cone base.
theAxis Cone axis.
theR1 Radius of the first cone base.
theR2 Radius of the second cone base.
thePnt Central point of the first cone base.
theAxis Cone axis.
theR1 Radius of the first cone base.
theR2 Radius of the second cone base.
Note:
If both radiuses are non-zero, the cone will be truncated.

If the radiuses are equal, a cylinder will be created instead.

Parameters:
- +
theH Cone height.
theH Cone height.
Returns:
New GEOM_Object, containing the created cone.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -2261,7 +2278,7 @@ Example: see GEOM_TestAll.py
MakeConeR1R2H def geompy::MakeConeR1R2H ( theR1 ,   theR1,
theR2 ,   theR2,
theH   theH
) 
- +

Axis of the cone will be collinear to the OZ axis of the coordinate system.

Parameters:
  @@ -2271,52 +2288,52 @@ Example: see GEOM_TestAll.py
- - + +
theR1 Radius of the first cone base.
theR2 Radius of the second cone base.
theR1 Radius of the first cone base.
theR2 Radius of the second cone base.
Note:
If both radiuses are non-zero, the cone will be truncated.

If the radiuses are equal, a cylinder will be created instead.

Parameters:
- +
theH Cone height.
theH Cone height.
Returns:
New GEOM_Object, containing the created cone.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -2324,7 +2341,7 @@ Example: see GEOM_TestAll.py
MakeTorus def geompy::MakeTorus ( thePnt ,   thePnt,
theVec ,   theVec,
theRMajor ,   theRMajor,
theRMinor   theRMinor
) 
- +

Parameters:
  @@ -2334,35 +2351,35 @@ Example: see GEOM_TestAll.py
- - - - + + + +
thePnt Torus central point.
theVec Torus axis of symmetry.
theRMajor Torus major radius.
theRMinor Torus minor radius.
thePnt Torus central point.
theVec Torus axis of symmetry.
theRMajor Torus major radius.
theRMinor Torus minor radius.
Returns:
New GEOM_Object, containing the created torus.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -2370,7 +2387,7 @@ Example: see GEOM_TestAll.py
MakeTorusRR def geompy::MakeTorusRR ( theRMajor ,   theRMajor,
theRMinor   theRMinor
) 
- +

Parameters:
  @@ -2380,39 +2397,39 @@ Example: see GEOM_TestAll.py
- - + +
theRMajor Torus major radius.
theRMinor Torus minor radius.
theRMajor Torus major radius.
theRMinor Torus minor radius.
Returns:
New GEOM_Object, containing the created torus.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -2420,7 +2437,7 @@ Example: see GEOM_TestAll.py
MakePrism def geompy::MakePrism ( theBase ,   theBase,
thePoint1 ,   thePoint1,
thePoint2   thePoint2
) 
- +

Parameters:
  @@ -2430,40 +2447,40 @@ Example: see GEOM_TestAll.py
- - - + + +
theBase Base shape to be extruded.
thePoint1 First end of extrusion vector.
thePoint2 Second end of extrusion vector.
theBase Base shape to be extruded.
thePoint1 First end of extrusion vector.
thePoint2 Second end of extrusion vector.
Returns:
New GEOM_Object, containing the created prism.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -2471,7 +2488,7 @@ Example: see GEOM_TestAll.py
MakePrismVecH def geompy::MakePrismVecH ( theBase ,   theBase,
theVec ,   theVec,
theH   theH
) 
- +

all the space, transfixed by the base shape during its translation along the vector on the given distance.

Parameters:
  @@ -2481,34 +2498,34 @@ Example: see GEOM_TestAll.py
- - - + + +
theBase Base shape to be extruded.
theVec Direction of extrusion.
theH Prism dimension along theVec.
theBase Base shape to be extruded.
theVec Direction of extrusion.
theH Prism dimension along theVec.
Returns:
New GEOM_Object, containing the created prism.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -2516,7 +2533,7 @@ Example: see GEOM_TestAll.py
MakePipe def geompy::MakePipe ( theBase ,   theBase,
thePath   thePath
) 
- +

The path shape can be a wire or an edge.

Parameters:
  @@ -2526,39 +2543,39 @@ Example: see GEOM_TestAll.py
- - + +
theBase Base shape to be extruded.
thePath Path shape to extrude the base shape along it.
theBase Base shape to be extruded.
thePath Path shape to extrude the base shape along it.
Returns:
New GEOM_Object, containing the created pipe.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -2566,7 +2583,7 @@ Example: see GEOM_TestAll.py
MakeRevolution def geompy::MakeRevolution ( theBase ,   theBase,
theAxis ,   theAxis,
theAngle   theAngle
) 
- +

all the space, transfixed by the base shape during its rotation around the axis on the given angle.

Parameters:
  @@ -2576,34 +2593,34 @@ Example: see GEOM_TestAll.py
- - - + + +
theBase Base shape to be rotated.
theAxis Rotation axis.
theAngle Rotation angle in radians.
theBase Base shape to be rotated.
theAxis Rotation axis.
theAngle Rotation angle in radians.
Returns:
New GEOM_Object, containing the created revolution.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -2611,7 +2628,7 @@ Example: see GEOM_TestAll.py
MakeEdge def geompy::MakeEdge ( thePnt1 ,   thePnt1,
thePnt2   thePnt2
) 
- +

Parameters:
  @@ -2621,24 +2638,24 @@ Example: see GEOM_TestAll.py
- - + +
thePnt1 Point for the first end of edge.
thePnt2 Point for the second end of edge.
thePnt1 Point for the first end of edge.
thePnt2 Point for the second end of edge.
Returns:
New GEOM_Object, containing the created edge.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -2646,7 +2663,7 @@ Example: see GEOM_TestAll.py
MakeWire def geompy::MakeWire ( theEdgesAndWires    theEdgesAndWires  ) 
- +

Parameters:
  @@ -2656,32 +2673,32 @@ Example: see GEOM_TestAll.py
- +
theEdgesAndWires List of edges and/or wires.
theEdgesAndWires List of edges and/or wires.
Returns:
New GEOM_Object, containing the created wire.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -2689,7 +2706,7 @@ Example: see GEOM_TestAll.py
MakeFace def geompy::MakeFace ( theWire ,   theWire,
isPlanarWanted   isPlanarWanted
) 
- +

Parameters:
  @@ -2699,33 +2716,33 @@ Example: see GEOM_TestAll.py
- - + +
theWire Wire to build the face on.
isPlanarWanted If TRUE, only planar face will be built. If impossible, NULL object will be returned.
theWire Wire to build the face on.
isPlanarWanted If TRUE, only planar face will be built. If impossible, NULL object will be returned.
Returns:
New GEOM_Object, containing the created face.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -2733,7 +2750,7 @@ Example: see GEOM_TestAll.py
MakeFaceWires def geompy::MakeFaceWires ( theWires ,   theWires,
isPlanarWanted   isPlanarWanted
) 
- +

Parameters:
  @@ -2743,33 +2760,33 @@ Example: see GEOM_TestAll.py
- - + +
theWires List of wires to build the face on.
isPlanarWanted If TRUE, only planar face will be built. If impossible, NULL object will be returned.
theWires List of wires to build the face on.
isPlanarWanted If TRUE, only planar face will be built. If impossible, NULL object will be returned.
Returns:
New GEOM_Object, containing the created face.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -2777,7 +2794,7 @@ Example: see GEOM_TestAll.py
MakeFaces def geompy::MakeFaces ( theWires ,   theWires,
isPlanarWanted   isPlanarWanted
) 
- +
Example: see GEOM_TestOthers.py
  @@ -2788,16 +2805,16 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -2805,7 +2822,7 @@ Example: see GEOM_TestOthers.py
MakeShell def geompy::MakeShell ( theFacesAndShells    theFacesAndShells  ) 
- +

Parameters:
  @@ -2815,23 +2832,23 @@ Example: see GEOM_TestOthers.py
- +
theFacesAndShells List of faces and/or shells.
theFacesAndShells List of faces and/or shells.
Returns:
New GEOM_Object, containing the created shell.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -2839,7 +2856,7 @@ Example: see GEOM_TestAll.py
MakeSolid def geompy::MakeSolid ( theShells    theShells  ) 
- +

Parameters:
  @@ -2849,23 +2866,23 @@ Example: see GEOM_TestAll.py
- +
theShells Sequence of bounding shells.
theShells Sequence of bounding shells.
Returns:
New GEOM_Object, containing the created solid.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -2873,7 +2890,7 @@ Example: see GEOM_TestAll.py
MakeCompound def geompy::MakeCompound ( theShapes    theShapes  ) 
- +

Parameters:
  @@ -2883,23 +2900,23 @@ Example: see GEOM_TestAll.py
- +
theShapes List of shapes to put in compound.
theShapes List of shapes to put in compound.
Returns:
New GEOM_Object, containing the created compound.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -2907,7 +2924,7 @@ Example: see GEOM_TestAll.py
NumberOfFaces def geompy::NumberOfFaces ( theShape    theShape  ) 
- +

Parameters:
  @@ -2917,23 +2934,23 @@ Example: see GEOM_TestAll.py
- +
theShape Shape to count faces of.
theShape Shape to count faces of.
Returns:
Quantity of faces.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + @@ -2941,7 +2958,7 @@ Example: see GEOM_TestOthers.py
NumberOfEdges def geompy::NumberOfEdges ( theShape    theShape  ) 
- +

Parameters:
  @@ -2951,23 +2968,23 @@ Example: see GEOM_TestOthers.py
- +
theShape Shape to count edges of.
theShape Shape to count edges of.
Returns:
Quantity of edges.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + @@ -2975,7 +2992,7 @@ Example: see GEOM_TestOthers.py
ChangeOrientation def geompy::ChangeOrientation ( theShape    theShape  ) 
- +

Parameters:
  @@ -2985,23 +3002,23 @@ Example: see GEOM_TestOthers.py
- +
theShape Shape to be reversed.
theShape Shape to be reversed.
Returns:
The reversed copy of theShape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -3009,7 +3026,7 @@ Example: see GEOM_TestAll.py
OrientationChange def geompy::OrientationChange ( theShape    theShape  ) 
- +
Example: see GEOM_TestOthers.py
  @@ -3020,16 +3037,16 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -3037,7 +3054,7 @@ Example: see GEOM_TestOthers.py
GetFreeFacesIDs def geompy::GetFreeFacesIDs ( theShape    theShape  ) 
- +

Free face is a face, which is not shared between two shells of the shape.

Parameters:
  @@ -3047,38 +3064,38 @@ Example: see GEOM_TestOthers.py
- +
theShape Shape to find free faces in.
theShape Shape to find free faces in.
Returns:
List of IDs of all free faces, contained in theShape.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -3086,7 +3103,7 @@ Example: see GEOM_TestOthers.py
GetSharedShapes def geompy::GetSharedShapes ( theShape1 ,   theShape1,
theShape2 ,   theShape2,
theShapeType   theShapeType
) 
- +

Parameters:
  @@ -3096,46 +3113,46 @@ Example: see GEOM_TestOthers.py
- - - + + +
theShape1 Shape to find sub-shapes in.
theShape2 Shape to find shared sub-shapes with.
theShapeType Type of sub-shapes to be retrieved.
theShape1 Shape to find sub-shapes in.
theShape2 Shape to find shared sub-shapes with.
theShapeType Type of sub-shapes to be retrieved.
Returns:
List of sub-shapes of theShape1, shared with theShape2.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -3143,7 +3160,7 @@ Example: see GEOM_TestOthers.py
GetShapesOnPlane def geompy::GetShapesOnPlane ( theShape ,   theShape,
theShapeType ,   theShapeType,
theAx1 ,   theAx1,
theState   theState
) 
- +

Parameters:
  @@ -3153,47 +3170,47 @@ Example: see GEOM_TestOthers.py
- - - - + + + +
theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved.
theAx1 Vector (or line, or linear edge), specifying normal direction and location of the plane to find shapes on.
theState The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved.
theAx1 Vector (or line, or linear edge), specifying normal direction and location of the plane to find shapes on.
theState The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
Returns:
List of all found sub-shapes.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -3201,7 +3218,7 @@ Example: see GEOM_TestOthers.py
GetShapesOnPlaneIDs def geompy::GetShapesOnPlaneIDs ( theShape ,   theShape,
theShapeType ,   theShapeType,
theAx1 ,   theAx1,
theState   theState
) 
- +
+Example: see GEOM_TestOthers.py
  @@ -3209,46 +3226,46 @@ Example: see GEOM_TestOthers.py

-

-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -3256,7 +3273,7 @@ Example: see GEOM_TestOthers.py
GetShapesOnCylinder def geompy::GetShapesOnCylinder ( theShape ,   theShape,
theShapeType ,   theShapeType,
theAxis ,   theAxis,
theRadius ,   theRadius,
theState   theState
) 
- +

Parameters:
  @@ -3266,54 +3283,54 @@ Example: see GEOM_TestOthers.py
- - - - - + + + + +
theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved.
theAxis Vector (or line, or linear edge), specifying axis of the cylinder to find shapes on.
theRadius Radius of the cylinder to find shapes on.
theState The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved.
theAxis Vector (or line, or linear edge), specifying axis of the cylinder to find shapes on.
theRadius Radius of the cylinder to find shapes on.
theState The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
Returns:
List of all found sub-shapes.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -3321,7 +3338,7 @@ Example: see GEOM_TestOthers.py
GetShapesOnCylinderIDs def geompy::GetShapesOnCylinderIDs ( theShape ,   theShape,
theShapeType ,   theShapeType,
theAxis ,   theAxis,
theRadius ,   theRadius,
theState   theState
) 
- +
+Example: see GEOM_TestOthers.py
  @@ -3329,46 +3346,46 @@ Example: see GEOM_TestOthers.py

-

-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -3376,7 +3393,7 @@ Example: see GEOM_TestOthers.py
GetShapesOnSphere def geompy::GetShapesOnSphere ( theShape ,   theShape,
theShapeType ,   theShapeType,
theCenter ,   theCenter,
theRadius ,   theRadius,
theState   theState
) 
- +

Parameters:
  @@ -3386,54 +3403,54 @@ Example: see GEOM_TestOthers.py
- - - - - + + + + +
theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved.
theCenter Point, specifying center of the sphere to find shapes on.
theRadius Radius of the sphere to find shapes on.
theState The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved.
theCenter Point, specifying center of the sphere to find shapes on.
theRadius Radius of the sphere to find shapes on.
theState The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
Returns:
List of all found sub-shapes.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -3441,7 +3458,7 @@ Example: see GEOM_TestOthers.py
GetShapesOnSphereIDs def geompy::GetShapesOnSphereIDs ( theShape ,   theShape,
theShapeType ,   theShapeType,
theCenter ,   theCenter,
theRadius ,   theRadius,
theState   theState
) 
- +
+Example: see GEOM_TestOthers.py
  @@ -3449,58 +3466,58 @@ Example: see GEOM_TestOthers.py

-

-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -3508,7 +3525,7 @@ Example: see GEOM_TestOthers.py
GetShapesOnQuadrangle def geompy::GetShapesOnQuadrangle ( theShape ,   theShape,
theShapeType ,   theShapeType,
theTopLeftPoint ,   theTopLeftPoint,
theTopRigthPoint ,   theTopRigthPoint,
theBottomLeftPoint ,   theBottomLeftPoint,
theBottomRigthPoint ,   theBottomRigthPoint,
theState   theState
) 
- +

Parameters:
  @@ -3518,66 +3535,66 @@ Example: see GEOM_TestOthers.py
- - - - - + + + + +
theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved.
theCenter Point, specifying center of the sphere to find shapes on.
theRadius Radius of the sphere to find shapes on.
theState The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
theShape Shape to find sub-shapes of.
theShapeType Type of sub-shapes to be retrieved.
theCenter Point, specifying center of the sphere to find shapes on.
theRadius Radius of the sphere to find shapes on.
theState The state of the subshapes to find. It can be one of ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN.
Returns:
List of all found sub-shapes.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -3585,7 +3602,7 @@ Example: see GEOM_TestOthers.py
GetShapesOnQuadrangleIDs def geompy::GetShapesOnQuadrangleIDs ( theShape ,   theShape,
theShapeType ,   theShapeType,
theTopLeftPoint ,   theTopLeftPoint,
theTopRigthPoint ,   theTopRigthPoint,
theBottomLeftPoint ,   theBottomLeftPoint,
theBottomRigthPoint ,   theBottomRigthPoint,
theState   theState
) 
- +
+Example: see GEOM_TestOthers.py
  @@ -3593,28 +3610,28 @@ Example: see GEOM_TestOthers.py

-

-

- +

+

- + - - + + - - - + + + - + @@ -3622,7 +3639,7 @@ Example: see GEOM_TestOthers.py
GetInPlace def geompy::GetInPlace ( theShapeWhere ,   theShapeWhere,
theShapeWhat   theShapeWhat
) 
- +

Parameters:
  @@ -3632,33 +3649,33 @@ Example: see GEOM_TestOthers.py
- - + +
theShapeWhere Shape to find sub-shapes of.
theShapeWhat Shape, specifying what to find.
theShapeWhere Shape to find sub-shapes of.
theShapeWhat Shape, specifying what to find.
Returns:
Group of all found sub-shapes or a single found sub-shape.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -3666,7 +3683,7 @@ Example: see GEOM_TestOthers.py
GetSubShape def geompy::GetSubShape ( aShape ,   aShape,
ListOfID   ListOfID
) 
- +
Example: see GEOM_TestAll.py
  @@ -3677,25 +3694,25 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -3703,7 +3720,7 @@ Example: see GEOM_TestAll.py
GetSubShapeID def geompy::GetSubShapeID ( aShape ,   aShape,
aSubShape   aSubShape
) 
- +
Example: see GEOM_TestAll.py
  @@ -3714,25 +3731,25 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -3740,7 +3757,7 @@ Example: see GEOM_TestAll.py
SubShapeAll def geompy::SubShapeAll ( aShape ,   aShape,
aType   aType
) 
- +

Parameters:
  @@ -3750,33 +3767,33 @@ Example: see GEOM_TestAll.py
- - + +
theShape Shape to be exploded.
theShapeType Type of sub-shapes to be retrieved.
theShape Shape to be exploded.
theShapeType Type of sub-shapes to be retrieved.
Returns:
List of sub-shapes of type theShapeType, contained in theShape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -3784,7 +3801,7 @@ Example: see GEOM_TestAll.py
SubShapeAllIDs def geompy::SubShapeAllIDs ( aShape ,   aShape,
aType   aType
) 
- +

Parameters:
  @@ -3794,33 +3811,33 @@ Example: see GEOM_TestAll.py
- - + +
theShape Shape to be exploded.
theShapeType Type of sub-shapes to be retrieved.
theShape Shape to be exploded.
theShapeType Type of sub-shapes to be retrieved.
Returns:
List of IDs of sub-shapes.
-

- +

+

- + - - + + - - - + + + - + @@ -3828,7 +3845,7 @@ Example: see GEOM_TestAll.py
SubShapeAllSorted def geompy::SubShapeAllSorted ( aShape ,   aShape,
aType   aType
) 
- +

Sub-shapes will be sorted by coordinates of their gravity centers.

Parameters:
  @@ -3838,33 +3855,33 @@ Example: see GEOM_TestAll.py
- - + +
theShape Shape to be exploded.
theShapeType Type of sub-shapes to be retrieved.
theShape Shape to be exploded.
theShapeType Type of sub-shapes to be retrieved.
Returns:
List of sub-shapes of type theShapeType, contained in theShape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -3872,7 +3889,7 @@ Example: see GEOM_TestAll.py
SubShapeAllSortedIDs def geompy::SubShapeAllSortedIDs ( aShape ,   aShape,
aType   aType
) 
- +

Sub-shapes will be sorted by coordinates of their gravity centers.

Parameters:
  @@ -3882,39 +3899,39 @@ Example: see GEOM_TestAll.py
- - + +
theShape Shape to be exploded.
theShapeType Type of sub-shapes to be retrieved.
theShape Shape to be exploded.
theShapeType Type of sub-shapes to be retrieved.
Returns:
List of IDs of sub-shapes.
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -3922,7 +3939,7 @@ Sub-shapes will be sorted by coordinates of their gravity centers.
<
SubShape def geompy::SubShape ( aShape ,   aShape,
aType ,   aType,
ListOfInd   ListOfInd
) 
- +
  @@ -3934,31 +3951,31 @@ Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type]

Example: see GEOM_TestAll.py

-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -3966,7 +3983,7 @@ Example: see GEOM_TestAll.py
SubShapeSorted def geompy::SubShapeSorted ( aShape ,   aShape,
aType ,   aType,
ListOfInd   ListOfInd
) 
- +
  @@ -3978,37 +3995,37 @@ Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type]

Example: see GEOM_TestAll.py

-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -4016,7 +4033,7 @@ Example: see GEOM_TestAll.py
ProcessShape def geompy::ProcessShape ( theShape ,   theShape,
theOperators ,   theOperators,
theParameters ,   theParameters,
theValues   theValues
) 
- +

Parameters:
  @@ -4026,35 +4043,35 @@ Example: see GEOM_TestAll.py
- - - - + + + +
theShape Shape to be processed.
theOperators List of names of operators ("FixShape", "SplitClosedFaces", etc.).
theParameters List of names of parameters ("FixShape.Tolerance3d", "SplitClosedFaces.NbSplitPoints", etc.).
theValues List of values of parameters, in the same order as parameters are listed in theParameters list.
theShape Shape to be processed.
theOperators List of names of operators ("FixShape", "SplitClosedFaces", etc.).
theParameters List of names of parameters ("FixShape.Tolerance3d", "SplitClosedFaces.NbSplitPoints", etc.).
theValues List of values of parameters, in the same order as parameters are listed in theParameters list.
Returns:
New GEOM_Object, containing processed shape.
Example: see GEOM_TestHealing.py
-

- +

+

- + - - + + - - - + + + - + @@ -4062,7 +4079,7 @@ Example: see GEOM_TestHealing.py
SuppressFaces def geompy::SuppressFaces ( theObject ,   theObject,
theFaces   theFaces
) 
- +

Parameters:
  @@ -4072,33 +4089,33 @@ Example: see GEOM_TestHealing.py
- - + +
theObject Shape to be processed.
theFaces Indices of faces to be removed, if EMPTY then the method removes ALL faces of the given object.
theObject Shape to be processed.
theFaces Indices of faces to be removed, if EMPTY then the method removes ALL faces of the given object.
Returns:
New GEOM_Object, containing processed shape.
Example: see GEOM_TestHealing.py
-

- +

+

- + - - + + - - - + + + - + @@ -4106,7 +4123,7 @@ Example: see GEOM_TestHealing.py
MakeSewing def geompy::MakeSewing ( ListShape ,   ListShape,
theTolerance   theTolerance
) 
- +
Example: see GEOM_TestHealing.py
  @@ -4117,25 +4134,25 @@ Example: see GEOM_TestHealing.py
-

- +

+

+Example: see MakeSewing() above
- + - - + + - - - + + + - + @@ -4143,7 +4160,7 @@ Example: see GEOM_TestHealing.py
Sew def geompy::Sew ( theObject ,   theObject,
theTolerance   theTolerance
) 
- +

Parameters:
  @@ -4153,33 +4170,33 @@ Example: see GEOM_TestHealing.py
- - + +
theObject Shape to be processed.
theTolerance Required tolerance value.
theObject Shape to be processed.
theTolerance Required tolerance value.
Returns:
New GEOM_Object, containing processed shape.
-Example: see MakeSewing() above
-

- +

+

- + - - + + - - - + + + - + @@ -4187,7 +4204,7 @@ Example: see MakeSewing() abov
SuppressInternalWires def geompy::SuppressInternalWires ( theObject ,   theObject,
theWires   theWires
) 
- +
  @@ -4197,33 +4214,33 @@ Example: see MakeSewing() abov

Parameters:
- - + +
theObject Shape to be processed.
theWires Indices of wires to be removed, if EMPTY then the method removes ALL internal wires of the given object.
theObject Shape to be processed.
theWires Indices of wires to be removed, if EMPTY then the method removes ALL internal wires of the given object.
Returns:
New GEOM_Object, containing processed shape.
Example: see GEOM_TestHealing.py
-

- +

+

- + - - + + - - - + + + - + @@ -4231,7 +4248,7 @@ Example: see GEOM_TestHealing.py
SuppressHoles def geompy::SuppressHoles ( theObject ,   theObject,
theWires   theWires
) 
- +

Parameters:
  @@ -4241,39 +4258,39 @@ Example: see GEOM_TestHealing.py
- - + +
theObject Shape to be processed.
theWires Indices of wires to be removed, if EMPTY then the method removes ALL internal holes of the given object
theObject Shape to be processed.
theWires Indices of wires to be removed, if EMPTY then the method removes ALL internal holes of the given object
Returns:
New GEOM_Object, containing processed shape.
Example: see GEOM_TestHealing.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -4281,7 +4298,7 @@ Example: see GEOM_TestHealing.py
CloseContour def geompy::CloseContour ( theObject ,   theObject,
theWires ,   theWires,
isCommonVertex   isCommonVertex
) 
- +

Parameters:
  @@ -4291,46 +4308,46 @@ Example: see GEOM_TestHealing.py
- - - + + +
theObject Shape to be processed.
theWires Indexes of edge(s) and wire(s) to be closed within theObject's shape, if -1, then theObject itself is a wire.
isCommonVertex If TRUE : closure by creation of a common vertex, If FALS : closure by creation of an edge between ends.
theObject Shape to be processed.
theWires Indexes of edge(s) and wire(s) to be closed within theObject's shape, if -1, then theObject itself is a wire.
isCommonVertex If TRUE : closure by creation of a common vertex, If FALS : closure by creation of an edge between ends.
Returns:
New GEOM_Object, containing processed shape.
Example: see GEOM_TestHealing.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -4338,7 +4355,7 @@ Example: see GEOM_TestHealing.py
DivideEdge def geompy::DivideEdge ( theObject ,   theObject,
theEdgeIndex ,   theEdgeIndex,
theValue ,   theValue,
isByParameter   isByParameter
) 
- +

Parameters:
  @@ -4348,26 +4365,26 @@ Example: see GEOM_TestHealing.py
- - - - + + + +
theObject Shape to be processed.
theEdgeIndex Index of edge to be divided within theObject's shape, if -1, then theObject itself is the edge.
theValue Value of parameter on edge or length parameter, depending on isByParameter.
isByParameter If TRUE : theValue is treated as a curve parameter [0..1], if FALSE : theValue is treated as a length parameter [0..1]
theObject Shape to be processed.
theEdgeIndex Index of edge to be divided within theObject's shape, if -1, then theObject itself is the edge.
theValue Value of parameter on edge or length parameter, depending on isByParameter.
isByParameter If TRUE : theValue is treated as a curve parameter [0..1], if FALSE : theValue is treated as a length parameter [0..1]
Returns:
New GEOM_Object, containing processed shape.
Example: see GEOM_TestHealing.py
-

- +

+

- + - - + + @@ -4375,7 +4392,7 @@ Example: see GEOM_TestHealing.py
GetFreeBoundary def geompy::GetFreeBoundary ( theObject    theObject  ) 
- +

Parameters:
  @@ -4385,23 +4402,23 @@ Example: see GEOM_TestHealing.py
- +
theObject Shape to get free boundary of.
theObject Shape to get free boundary of.
Returns:
[status, theClosedWires, theOpenWires] status: FALSE, if an error(s) occured during the method execution. theClosedWires: Closed wires on the free boundary of the given shape. theOpenWires: Open wires on the free boundary of the given shape.
Example: see GEOM_TestHealing.py
-

- +

+

- + - - + + @@ -4409,7 +4426,7 @@ Example: see GEOM_TestHealing.py
MakeCopy def geompy::MakeCopy ( theOriginal    theOriginal  ) 
- +
Example: see GEOM_TestAll.py
  @@ -4420,49 +4437,49 @@ Example: see GEOM_TestHealing.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -4470,7 +4487,7 @@ Example: see GEOM_TestAll.py
MakeFilling def geompy::MakeFilling ( theShape ,   theShape,
theMinDeg ,   theMinDeg,
theMaxDeg ,   theMaxDeg,
theTol2D ,   theTol2D,
theTol3D ,   theTol3D,
theNbIter   theNbIter
) 
- +

Parameters:
  @@ -4480,37 +4497,37 @@ Example: see GEOM_TestAll.py
- - - - - - + + + + + +
theShape the compound of contours
theMinDeg a minimal degree
theMaxDeg a maximal degree
theTol2D a 2d tolerance
theTol3D a 3d tolerance
theNbIter a number of iteration
theShape the compound of contours
theMinDeg a minimal degree
theMaxDeg a maximal degree
theTol2D a 2d tolerance
theTol3D a 3d tolerance
theNbIter a number of iteration
Returns:
New GEOM_Object, containing the created filling surface.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -4518,7 +4535,7 @@ Example: see GEOM_TestAll.py
MakeGlueFaces def geompy::MakeGlueFaces ( theShape ,   theShape,
theTolerance   theTolerance
) 
- +

Parameters:
  @@ -4528,39 +4545,39 @@ Example: see GEOM_TestAll.py
- - + +
theShape Initial shape.
theTolerance Maximum distance between faces, which can be considered as coincident.
theShape Initial shape.
theTolerance Maximum distance between faces, which can be considered as coincident.
Returns:
New GEOM_Object, containing a copy of theShape without coincident faces.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -4568,7 +4585,7 @@ Example: see GEOM_Spanner.py
MakeBoolean def geompy::MakeBoolean ( theShape1 ,   theShape1,
theShape2 ,   theShape2,
theOperation   theOperation
) 
- +

Parameters:
  @@ -4578,34 +4595,34 @@ Example: see GEOM_Spanner.py
- - - + + +
theShape1 First argument for boolean operation.
theShape2 Second argument for boolean operation.
theOperation Indicates the operation to be done: 1 - Common, 2 - Cut, 3 - Fuse, 4 - Section.
theShape1 First argument for boolean operation.
theShape2 Second argument for boolean operation.
theOperation Indicates the operation to be done: 1 - Common, 2 - Cut, 3 - Fuse, 4 - Section.
Returns:
New GEOM_Object, containing the result shape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -4613,7 +4630,7 @@ Example: see GEOM_TestAll.py
MakeCommon def geompy::MakeCommon ( s1 ,   s1,
s2   s2
) 
- +
Example: see GEOM_TestOthers.py
  @@ -4624,25 +4641,25 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -4650,7 +4667,7 @@ Example: see GEOM_TestOthers.py
MakeCut def geompy::MakeCut ( s1 ,   s1,
s2   s2
) 
- +
Example: see GEOM_TestOthers.py
  @@ -4661,25 +4678,25 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -4687,7 +4704,7 @@ Example: see GEOM_TestOthers.py
MakeFuse def geompy::MakeFuse ( s1 ,   s1,
s2   s2
) 
- +
Example: see GEOM_TestOthers.py
  @@ -4698,25 +4715,25 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -4724,7 +4741,7 @@ Example: see GEOM_TestOthers.py
MakeSection def geompy::MakeSection ( s1 ,   s1,
s2   s2
) 
- +
Example: see GEOM_TestOthers.py
  @@ -4735,55 +4752,55 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -4791,7 +4808,7 @@ Example: see GEOM_TestOthers.py
MakePartition def geompy::MakePartition ( ListShapes ,   ListShapes,
ListTools  = [],   ListTools = [],
ListKeepInside  = [],   ListKeepInside = [],
ListRemoveInside  = [],   ListRemoveInside = [],
Limit  = ShapeType["SHAPE"],   Limit = ShapeType["SHAPE"],
RemoveWebs  = 0,   RemoveWebs = 0,
ListMaterials  = []  ListMaterials = []
) 
- +

Parameters:
  @@ -4801,68 +4818,68 @@ Example: see GEOM_TestOthers.py
- - - - - - - + + + + + + +
ListShapes Shapes to be intersected.
ListTools Shapes to intersect theShapes.
ListKeepInside Shapes, outside which the results will be deleted. Each shape from theKeepInside must belong to theShapes also.
ListRemoveInside Shapes, inside which the results will be deleted. Each shape from theRemoveInside must belong to theShapes also.
Limit Type of resulting shapes (corresponding to TopAbs_ShapeEnum).
RemoveWebs If TRUE, perform Glue 3D algorithm.
ListMaterials Material indices for each shape. Make sence, only if theRemoveWebs is TRUE.
ListShapes Shapes to be intersected.
ListTools Shapes to intersect theShapes.
ListKeepInside Shapes, outside which the results will be deleted. Each shape from theKeepInside must belong to theShapes also.
ListRemoveInside Shapes, inside which the results will be deleted. Each shape from theRemoveInside must belong to theShapes also.
Limit Type of resulting shapes (corresponding to TopAbs_ShapeEnum).
RemoveWebs If TRUE, perform Glue 3D algorithm.
ListMaterials Material indices for each shape. Make sence, only if theRemoveWebs is TRUE.
Returns:
New GEOM_Object, containing the result shapes.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -4870,7 +4887,7 @@ Example: see GEOM_TestAll.py
Partition def geompy::Partition ( ListShapes ,   ListShapes,
ListTools  = [],   ListTools = [],
ListKeepInside  = [],   ListKeepInside = [],
ListRemoveInside  = [],   ListRemoveInside = [],
Limit  = ShapeType["SHAPE"],   Limit = ShapeType["SHAPE"],
RemoveWebs  = 0,   RemoveWebs = 0,
ListMaterials  = []  ListMaterials = []
) 
- +
Example: see GEOM_TestOthers.py
  @@ -4881,25 +4898,25 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -4907,7 +4924,7 @@ Example: see GEOM_TestOthers.py
MakeHalfPartition def geompy::MakeHalfPartition ( theShape ,   theShape,
thePlane   thePlane
) 
- +

Parameters:
  @@ -4917,39 +4934,39 @@ Example: see GEOM_TestOthers.py
- - + +
theShape Shape to be intersected.
thePlane Tool shape, to intersect theShape.
theShape Shape to be intersected.
thePlane Tool shape, to intersect theShape.
Returns:
New GEOM_Object, containing the result shape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -4957,7 +4974,7 @@ Example: see GEOM_TestAll.py
MakeTranslationTwoPoints def geompy::MakeTranslationTwoPoints ( theObject ,   theObject,
thePoint1 ,   thePoint1,
thePoint2   thePoint2
) 
- +

Parameters:
  @@ -4967,46 +4984,46 @@ Example: see GEOM_TestAll.py
- - - + + +
theObject The object to be translated.
thePoint1 Start point of translation vector.
thePoint2 End point of translation vector.
theObject The object to be translated.
thePoint1 Start point of translation vector.
thePoint2 End point of translation vector.
Returns:
New GEOM_Object, containing the translated object.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -5014,7 +5031,7 @@ Example: see GEOM_TestAll.py
MakeTranslation def geompy::MakeTranslation ( theObject ,   theObject,
theDX ,   theDX,
theDY ,   theDY,
theDZ   theDZ
) 
- +

Parameters:
  @@ -5024,33 +5041,33 @@ Example: see GEOM_TestAll.py
- - + +
theObject The object to be translated.
theDX,theDY,theDZ Components of translation vector.
theObject The object to be translated.
theDX,theDY,theDZ Components of translation vector.
Returns:
New GEOM_Object, containing the translated object.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -5058,7 +5075,7 @@ Example: see GEOM_TestAll.py
MakeTranslationVector def geompy::MakeTranslationVector ( theObject ,   theObject,
theVector   theVector
) 
- +

Parameters:
  @@ -5068,39 +5085,39 @@ Example: see GEOM_TestAll.py
- - + +
theObject The object to be translated.
theVector The translation vector.
theObject The object to be translated.
theVector The translation vector.
Returns:
New GEOM_Object, containing the translated object.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -5108,7 +5125,7 @@ Example: see GEOM_TestAll.py
MakeRotation def geompy::MakeRotation ( theObject ,   theObject,
theAxis ,   theAxis,
theAngle   theAngle
) 
- +

Parameters:
  @@ -5118,40 +5135,40 @@ Example: see GEOM_TestAll.py
- - - + + +
theObject The object to be rotated.
theAxis Rotation axis.
theAngle Rotation angle in radians.
theObject The object to be rotated.
theAxis Rotation axis.
theAngle Rotation angle in radians.
Returns:
New GEOM_Object, containing the rotated object.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -5159,7 +5176,7 @@ Example: see GEOM_TestAll.py
MakeScaleTransform def geompy::MakeScaleTransform ( theObject ,   theObject,
thePoint ,   thePoint,
theFactor   theFactor
) 
- +

Parameters:
  @@ -5169,34 +5186,34 @@ Example: see GEOM_TestAll.py
- - - + + +
theObject The object to be scaled.
thePoint Center point for scaling.
theFactor Scaling factor value.
theObject The object to be scaled.
thePoint Center point for scaling.
theFactor Scaling factor value.
Returns:
New GEOM_Object, containing the scaled shape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -5204,7 +5221,7 @@ Example: see GEOM_TestAll.py
MakeMirrorByPlane def geompy::MakeMirrorByPlane ( theObject ,   theObject,
thePlane   thePlane
) 
- +

Parameters:
  @@ -5214,33 +5231,33 @@ Example: see GEOM_TestAll.py
- - + +
theObject The object to be mirrored.
thePlane Plane of symmetry.
theObject The object to be mirrored.
thePlane Plane of symmetry.
Returns:
New GEOM_Object, containing the mirrored shape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -5248,7 +5265,7 @@ Example: see GEOM_TestAll.py
MakeMirrorByAxis def geompy::MakeMirrorByAxis ( theObject ,   theObject,
theAxis   theAxis
) 
- +

Parameters:
  @@ -5258,33 +5275,33 @@ Example: see GEOM_TestAll.py
- - + +
theObject The object to be mirrored.
theAxis Axis of symmetry.
theObject The object to be mirrored.
theAxis Axis of symmetry.
Returns:
New GEOM_Object, containing the mirrored shape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -5292,7 +5309,7 @@ Example: see GEOM_TestAll.py
MakeMirrorByPoint def geompy::MakeMirrorByPoint ( theObject ,   theObject,
thePoint   thePoint
) 
- +

Parameters:
  @@ -5302,39 +5319,39 @@ Example: see GEOM_TestAll.py
- - + +
theObject The object to be mirrored.
thePoint Point of symmetry.
theObject The object to be mirrored.
thePoint Point of symmetry.
Returns:
New GEOM_Object, containing the mirrored shape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -5342,7 +5359,7 @@ Example: see GEOM_TestAll.py
MakePosition def geompy::MakePosition ( theObject ,   theObject,
theStartLCS ,   theStartLCS,
theEndLCS   theEndLCS
) 
- +
Example: see GEOM_TestAll.py
  @@ -5353,25 +5370,25 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -5379,7 +5396,7 @@ Example: see GEOM_TestAll.py
MakeOffset def geompy::MakeOffset ( theObject ,   theObject,
theOffset   theOffset
) 
- +

Parameters:
  @@ -5389,45 +5406,45 @@ Example: see GEOM_TestAll.py
- - + +
theObject The base object for the offset.
theOffset Offset value.
theObject The base object for the offset.
theOffset Offset value.
Returns:
New GEOM_Object, containing the offset object.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -5435,7 +5452,7 @@ Example: see GEOM_TestAll.py
MakeMultiTranslation1D def geompy::MakeMultiTranslation1D ( theObject ,   theObject,
theVector ,   theVector,
theStep ,   theStep,
theNbTimes   theNbTimes
) 
- +

Parameters:
  @@ -5445,65 +5462,65 @@ Example: see GEOM_TestAll.py
- - - - + + + +
theObject The object to be translated.
theVector Direction of the translation.
theStep Distance to translate on.
theNbTimes Quantity of translations to be done.
theObject The object to be translated.
theVector Direction of the translation.
theStep Distance to translate on.
theNbTimes Quantity of translations to be done.
Returns:
New GEOM_Object, containing compound of all the shapes, obtained after each translation.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -5511,7 +5528,7 @@ Example: see GEOM_TestAll.py
MakeMultiTranslation2D def geompy::MakeMultiTranslation2D ( theObject ,   theObject,
theVector1 ,   theVector1,
theStep1 ,   theStep1,
theNbTimes1 ,   theNbTimes1,
theVector2 ,   theVector2,
theStep2 ,   theStep2,
theNbTimes2   theNbTimes2
) 
- +

Parameters:
  @@ -5521,44 +5538,44 @@ Example: see GEOM_TestAll.py
- - - - - - - + + + + + + +
theObject The object to be translated.
theVector1 Direction of the first translation.
theStep1 Step of the first translation.
theNbTimes1 Quantity of translations to be done along theVector1.
theVector2 Direction of the second translation.
theStep2 Step of the second translation.
theNbTimes2 Quantity of translations to be done along theVector2.
theObject The object to be translated.
theVector1 Direction of the first translation.
theStep1 Step of the first translation.
theNbTimes1 Quantity of translations to be done along theVector1.
theVector2 Direction of the second translation.
theStep2 Step of the second translation.
theNbTimes2 Quantity of translations to be done along theVector2.
Returns:
New GEOM_Object, containing compound of all the shapes, obtained after each translation.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -5566,7 +5583,7 @@ Example: see GEOM_TestAll.py
MultiRotate1D def geompy::MultiRotate1D ( theObject ,   theObject,
theAxis ,   theAxis,
theNbTimes   theNbTimes
) 
- +

Rotation angle will be 2*PI/theNbTimes.

Parameters:
  @@ -5576,58 +5593,58 @@ Example: see GEOM_TestAll.py
- - - + + +
theObject The object to be rotated.
theAxis The rotation axis.
theNbTimes Quantity of rotations to be done.
theObject The object to be rotated.
theAxis The rotation axis.
theNbTimes Quantity of rotations to be done.
Returns:
New GEOM_Object, containing compound of all the shapes, obtained after each rotation.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -5635,7 +5652,7 @@ Example: see GEOM_TestAll.py
MultiRotate2D def geompy::MultiRotate2D ( theObject ,   theObject,
theAxis ,   theAxis,
theAngle ,   theAngle,
theNbTimes1 ,   theNbTimes1,
theStep ,   theStep,
theNbTimes2   theNbTimes2
) 
- +

Translation direction passes through center of gravity of rotated shape and its projection on the rotation axis.

Parameters:
  @@ -5645,49 +5662,49 @@ Example: see GEOM_TestAll.py
- - - - - - + + + + + +
theObject The object to be rotated.
theAxis Rotation axis.
theAngle Rotation angle in graduces.
theNbTimes1 Quantity of rotations to be done.
theStep Translation distance.
theNbTimes2 Quantity of translations to be done.
theObject The object to be rotated.
theAxis Rotation axis.
theAngle Rotation angle in graduces.
theNbTimes1 Quantity of rotations to be done.
theStep Translation distance.
theNbTimes2 Quantity of translations to be done.
Returns:
New GEOM_Object, containing compound of all the shapes, obtained after each transformation.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -5695,7 +5712,7 @@ Example: see GEOM_TestAll.py
MakeMultiRotation1D def geompy::MakeMultiRotation1D ( aShape ,   aShape,
aDir ,   aDir,
aPoint ,   aPoint,
aNbTimes   aNbTimes
) 
- +
Example: see GEOM_TestOthers.py
  @@ -5706,55 +5723,55 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -5762,7 +5779,7 @@ Example: see GEOM_TestOthers.py
MakeMultiRotation2D def geompy::MakeMultiRotation2D ( aShape ,   aShape,
aDir ,   aDir,
aPoint ,   aPoint,
anAngle ,   anAngle,
nbtimes1 ,   nbtimes1,
aStep ,   aStep,
nbtimes2   nbtimes2
) 
- +
Example: see GEOM_TestOthers.py
  @@ -5773,25 +5790,25 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -5799,7 +5816,7 @@ Example: see GEOM_TestOthers.py
MakeFilletAll def geompy::MakeFilletAll ( theShape ,   theShape,
theR   theR
) 
- +

Parameters:
  @@ -5809,45 +5826,45 @@ Example: see GEOM_TestOthers.py
- - + +
theShape Shape, to perform fillet on.
theR Fillet radius.
theShape Shape, to perform fillet on.
theR Fillet radius.
Returns:
New GEOM_Object, containing the result shape.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -5855,7 +5872,7 @@ Example: see GEOM_TestOthers.py
MakeFillet def geompy::MakeFillet ( theShape ,   theShape,
theR ,   theR,
theShapeType ,   theShapeType,
theListShapes   theListShapes
) 
- +

Parameters:
  @@ -5865,36 +5882,36 @@ Example: see GEOM_TestOthers.py
- - - - + + + +
theShape Shape, to perform fillet on.
theR Fillet radius.
theShapeType Type of shapes in <thelistshapes>.
theListShapes Global indices of edges/faces to perform fillet on.
theShape Shape, to perform fillet on.
theR Fillet radius.
theShapeType Type of shapes in <theListShapes>.
theListShapes Global indices of edges/faces to perform fillet on.
-
Note:
Global index of sub-shape can be obtained, using method geompy.GetSubShapeID().
+
Note:
Global index of sub-shape can be obtained, using method geompy.GetSubShapeID().
Returns:
New GEOM_Object, containing the result shape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - + @@ -5902,7 +5919,7 @@ Example: see GEOM_TestAll.py
MakeChamferAll def geompy::MakeChamferAll ( theShape ,   theShape,
theD   theD
) 
- +

Parameters:
  @@ -5912,51 +5929,51 @@ Example: see GEOM_TestAll.py
- - + +
theShape Shape, to perform chamfer on.
theD Chamfer size along each face.
theShape Shape, to perform chamfer on.
theD Chamfer size along each face.
Returns:
New GEOM_Object, containing the result shape.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -5964,7 +5981,7 @@ Example: see GEOM_TestOthers.py
MakeChamferEdge def geompy::MakeChamferEdge ( theShape ,   theShape,
theD1 ,   theD1,
theD2 ,   theD2,
theFace1 ,   theFace1,
theFace2   theFace2
) 
- +

Parameters:
  @@ -5974,48 +5991,48 @@ Example: see GEOM_TestOthers.py
- - - - + + + +
theShape Shape, to perform chamfer on.
theD1 Chamfer size along theFace1.
theD2 Chamfer size along theFace2.
theFace1,theFace2 Global indices of two faces of theShape.
theShape Shape, to perform chamfer on.
theD1 Chamfer size along theFace1.
theD2 Chamfer size along theFace2.
theFace1,theFace2 Global indices of two faces of theShape.
-
Note:
Global index of sub-shape can be obtained, using method geompy.GetSubShapeID().
+
Note:
Global index of sub-shape can be obtained, using method geompy.GetSubShapeID().
Returns:
New GEOM_Object, containing the result shape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -6023,7 +6040,7 @@ Example: see GEOM_TestAll.py
MakeChamferFaces def geompy::MakeChamferFaces ( theShape ,   theShape,
theD1 ,   theD1,
theD2 ,   theD2,
theFaces   theFaces
) 
- +

Parameters:
  @@ -6033,54 +6050,54 @@ Example: see GEOM_TestAll.py
- - - - + + + +
theShape Shape, to perform chamfer on.
theD1 Chamfer size along face from theFaces. If both faces, connected to the edge, are in theFaces, theD1 will be get along face, which is nearer to theFaces beginning.
theD2 Chamfer size along another of two faces, connected to the edge.
theFaces Sequence of global indices of faces of theShape.
theShape Shape, to perform chamfer on.
theD1 Chamfer size along face from theFaces. If both faces, connected to the edge, are in theFaces, theD1 will be get along face, which is nearer to theFaces beginning.
theD2 Chamfer size along another of two faces, connected to the edge.
theFaces Sequence of global indices of faces of theShape.
-
Note:
Global index of sub-shape can be obtained, using method geompy.GetSubShapeID().
+
Note:
Global index of sub-shape can be obtained, using method geompy.GetSubShapeID().
Returns:
New GEOM_Object, containing the result shape.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -6088,7 +6105,7 @@ Example: see GEOM_TestAll.py
MakeChamfer def geompy::MakeChamfer ( aShape ,   aShape,
d1 ,   d1,
d2 ,   d2,
aShapeType ,   aShapeType,
ListShape   ListShape
) 
- +
Example: see GEOM_TestOthers.py
  @@ -6099,37 +6116,37 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -6137,7 +6154,7 @@ Example: see GEOM_TestOthers.py
Archimede def geompy::Archimede ( theShape ,   theShape,
theWeight ,   theWeight,
theWaterDensity ,   theWaterDensity,
theMeshDeflection   theMeshDeflection
) 
- +
  @@ -6145,28 +6162,28 @@ Example: see GEOM_TestOthers.py

-The object presenting the resulting face is returned

Parameters:
+The object presenting the resulting face is returned.
Parameters:
- - - - + + + +
theShape Shape to be put in water.
theWeight Weight og the shape.
theWaterDensity Density of the water.
theMeshDeflection Deflection of the mesh, using to compute the section.
theShape Shape to be put in water.
theWeight Weight og the shape.
theWaterDensity Density of the water.
theMeshDeflection Deflection of the mesh, using to compute the section.
Returns:
New GEOM_Object, containing a section of theShape by a plane, corresponding to water level.
Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -6174,7 +6191,7 @@ Example: see GEOM_TestAll.py
PointCoordinates def geompy::PointCoordinates ( Point    Point  ) 
- +

Returns:
[x, y, z]
-Example: see GEOM_TestMeasures.py +Example: see GEOM_TestMeasures.py
  @@ -6183,19 +6200,19 @@ Example: see GEOM_TestAll.py
-

- +

+

- + - - + + @@ -6203,7 +6220,7 @@ Example: see GEOM_TestMeasures.
BasicProperties def geompy::BasicProperties ( theShape    theShape  ) 
- +
+Example: see GEOM_TestMeasures.py
  @@ -6213,23 +6230,23 @@ Example: see GEOM_TestMeasures.

Parameters:
- +
theShape Shape to define properties of.
theShape Shape to define properties of.
Returns:
[theLength, theSurfArea, theVolume] theLength: Summarized length of all wires of the given shape. theSurfArea: Area of surface of the given shape. theVolume: Volume of the given shape.
-Example: see GEOM_TestMeasures.py
-

- +

+

- + - - + + @@ -6237,7 +6254,7 @@ Example: see GEOM_TestMeasures.
BoundingBox def geompy::BoundingBox ( theShape    theShape  ) 
- +
+Example: see GEOM_TestMeasures.py
  @@ -6247,23 +6264,23 @@ Example: see GEOM_TestMeasures.

Parameters:
- +
theShape Shape to obtain bounding box of.
theShape Shape to obtain bounding box of.
Returns:
[Xmin,Xmax, Ymin,Ymax, Zmin,Zmax] Xmin,Xmax: Limits of shape along OX axis. Ymin,Ymax: Limits of shape along OY axis. Zmin,Zmax: Limits of shape along OZ axis.
-Example: see GEOM_TestMeasures.py
-

- +

+

- + - - + + @@ -6271,7 +6288,7 @@ Example: see GEOM_TestMeasures.
Inertia def geompy::Inertia ( theShape    theShape  ) 
- +
+Example: see GEOM_TestMeasures.py
  @@ -6281,32 +6298,32 @@ Example: see GEOM_TestMeasures.

Parameters:
- +
theShape Shape to calculate inertia of.
theShape Shape to calculate inertia of.
Returns:
[I11,I12,I13, I21,I22,I23, I31,I32,I33, Ix,Iy,Iz] I(1-3)(1-3): Components of the inertia matrix of the given shape. Ix,Iy,Iz: Moments of inertia of the given shape.
-Example: see GEOM_TestMeasures.py
-

- +

+

- + - - + + - - - + + + - + @@ -6314,7 +6331,7 @@ Example: see GEOM_TestMeasures.
MinDistance def geompy::MinDistance ( theShape1 ,   theShape1,
theShape2   theShape2
) 
- +
+Example: see GEOM_TestMeasures.py
  @@ -6324,23 +6341,23 @@ Example: see GEOM_TestMeasures.

Parameters:
- +
theShape1,theShape2 Shapes to find minimal distance between.
theShape1,theShape2 Shapes to find minimal distance between.
Returns:
Value of the minimal distance between the given shapes.
-Example: see GEOM_TestMeasures.py
-

- +

+

- + - - + + @@ -6348,7 +6365,7 @@ Example: see GEOM_TestMeasures.
Tolerance def geompy::Tolerance ( theShape    theShape  ) 
- +
+Example: see GEOM_TestMeasures.py
  @@ -6358,23 +6375,23 @@ Example: see GEOM_TestMeasures.

Parameters:
- +
theShape Shape, to get tolerances of.
theShape Shape, to get tolerances of.
Returns:
[FaceMin,FaceMax, EdgeMin,EdgeMax, VertMin,VertMax] FaceMin,FaceMax: Min and max tolerances of the faces. EdgeMin,EdgeMax: Min and max tolerances of the edges. VertMin,VertMax: Min and max tolerances of the vertices.
-Example: see GEOM_TestMeasures.py
-

- +

+

- + - - + + @@ -6382,7 +6399,7 @@ Example: see GEOM_TestMeasures.
WhatIs def geompy::WhatIs ( theShape    theShape  ) 
- +
+Example: see GEOM_TestMeasures.py
  @@ -6392,23 +6409,23 @@ Example: see GEOM_TestMeasures.

Parameters:
- +
theShape Shape to be described.
theShape Shape to be described.
Returns:
Description of the given shape.
-Example: see GEOM_TestMeasures.py
-

- +

+

- + - - + + @@ -6416,7 +6433,7 @@ Example: see GEOM_TestMeasures.
MakeCDG def geompy::MakeCDG ( theShape    theShape  ) 
- +
+Example: see GEOM_TestMeasures.py
  @@ -6426,23 +6443,23 @@ Example: see GEOM_TestMeasures.

Parameters:
- +
theShape Shape to define centre of mass of.
theShape Shape to define centre of mass of.
Returns:
New GEOM_Object, containing the created point.
-Example: see GEOM_TestMeasures.py
-

- +

+

- + - - + + @@ -6450,7 +6467,7 @@ Example: see GEOM_TestMeasures.
CheckShape def geompy::CheckShape ( theShape    theShape  ) 
- +
+Example: see GEOM_TestMeasures.py
  @@ -6460,32 +6477,32 @@ Example: see GEOM_TestMeasures.

Parameters:
- +
theShape Shape to check validity of.
theShape Shape to check validity of.
Returns:
TRUE, if the shape "seems to be valid" from the topological point of view. If theShape is invalid, prints a description of problem.
-Example: see GEOM_TestMeasures.py
-

- +

+

- + - - + + - - - + + + - + @@ -6493,7 +6510,7 @@ Example: see GEOM_TestMeasures.
Import def geompy::Import ( theFileName ,   theFileName,
theFormatName   theFormatName
) 
- +
  @@ -6503,24 +6520,24 @@ Example: see GEOM_TestMeasures.

Parameters:
- - + +
theFileName The file, containing the shape.
theFormatName Specify format for the file reading. Available formats can be obtained with InsertOp.ImportTranslators() method.
theFileName The file, containing the shape.
theFormatName Specify format for the file reading. Available formats can be obtained with InsertOp.ImportTranslators() method.
Returns:
New GEOM_Object, containing the imported shape.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + @@ -6528,7 +6545,7 @@ Example: see GEOM_TestOthers.py
ImportBREP def geompy::ImportBREP ( theFileName    theFileName  ) 
- +
Example: see GEOM_TestOthers.py
  @@ -6539,16 +6556,16 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + @@ -6556,7 +6573,7 @@ Example: see GEOM_TestOthers.py
ImportIGES def geompy::ImportIGES ( theFileName    theFileName  ) 
- +
Example: see GEOM_TestOthers.py
  @@ -6567,16 +6584,16 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + @@ -6584,7 +6601,7 @@ Example: see GEOM_TestOthers.py
ImportSTEP def geompy::ImportSTEP ( theFileName    theFileName  ) 
- +
Example: see GEOM_TestOthers.py
  @@ -6595,31 +6612,31 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -6627,7 +6644,7 @@ Example: see GEOM_TestOthers.py
Export def geompy::Export ( theObject ,   theObject,
theFileName ,   theFileName,
theFormatName   theFormatName
) 
- +

Parameters:
  @@ -6637,33 +6654,33 @@ Example: see GEOM_TestOthers.py
- - - + + +
theObject Shape to be stored in the file.
theFileName Name of the file to store the given shape in.
theFormatName Specify format for the shape storage. Available formats can be obtained with InsertOp.ImportTranslators() method.
theObject Shape to be stored in the file.
theFileName Name of the file to store the given shape in.
theFormatName Specify format for the shape storage. Available formats can be obtained with InsertOp.ImportTranslators() method.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -6671,7 +6688,7 @@ Example: see GEOM_TestOthers.py
ExportBREP def geompy::ExportBREP ( theObject ,   theObject,
theFileName   theFileName
) 
- +
Example: see GEOM_TestOthers.py
  @@ -6682,25 +6699,25 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -6708,7 +6725,7 @@ Example: see GEOM_TestOthers.py
ExportIGES def geompy::ExportIGES ( theObject ,   theObject,
theFileName   theFileName
) 
- +
Example: see GEOM_TestOthers.py
  @@ -6719,25 +6736,25 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -6745,7 +6762,7 @@ Example: see GEOM_TestOthers.py
ExportSTEP def geompy::ExportSTEP ( theObject ,   theObject,
theFileName   theFileName
) 
- +
Example: see GEOM_TestOthers.py
  @@ -6756,37 +6773,37 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -6794,7 +6811,7 @@ Example: see GEOM_TestOthers.py
MakeQuad def geompy::MakeQuad ( E1 ,   E1,
E2 ,   E2,
E3 ,   E3,
E4   E4
) 
- +

Order of Edges is not important. It is not necessary that edges share the same vertex.

Parameters:
  @@ -6804,32 +6821,32 @@ Example: see GEOM_TestOthers.py
- +
E1,E2,E3,E4 Edges for the face bound.
E1,E2,E3,E4 Edges for the face bound.
Returns:
New GEOM_Object, containing the created face.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - + @@ -6837,7 +6854,7 @@ Example: see GEOM_Spanner.py
MakeQuad2Edges def geompy::MakeQuad2Edges ( E1 ,   E1,
E2   E2
) 
- +

The missing edges will be built by creating the shortest ones.

Parameters:
  @@ -6847,44 +6864,44 @@ Example: see GEOM_Spanner.py
- +
E1,E2 Two opposite edges for the face.
E1,E2 Two opposite edges for the face.
Returns:
New GEOM_Object, containing the created face.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -6892,7 +6909,7 @@ Example: see GEOM_Spanner.py
MakeQuad4Vertices def geompy::MakeQuad4Vertices ( V1 ,   V1,
V2 ,   V2,
V3 ,   V3,
V4   V4
) 
- +

The missing edges will be built by creating the shortest ones.

Parameters:
  @@ -6902,56 +6919,56 @@ Example: see GEOM_Spanner.py
- +
V1,V2,V3,V4 Corner vertices for the face.
V1,V2,V3,V4 Corner vertices for the face.
Returns:
New GEOM_Object, containing the created face.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -6959,7 +6976,7 @@ Example: see GEOM_Spanner.py
MakeHexa def geompy::MakeHexa ( F1 ,   F1,
F2 ,   F2,
F3 ,   F3,
F4 ,   F4,
F5 ,   F5,
F6   F6
) 
- +

Order of faces is not important. It is not necessary that Faces share the same edge.

Parameters:
  @@ -6969,32 +6986,32 @@ Example: see GEOM_Spanner.py
- +
F1,F2,F3,F4,F5,F6 Faces for the hexahedral solid.
F1,F2,F3,F4,F5,F6 Faces for the hexahedral solid.
Returns:
New GEOM_Object, containing the created solid.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - + @@ -7002,7 +7019,7 @@ Example: see GEOM_Spanner.py
MakeHexa2Faces def geompy::MakeHexa2Faces ( F1 ,   F1,
F2   F2
) 
- +

The missing faces will be built by creating the smallest ones.

Parameters:
  @@ -7012,50 +7029,50 @@ Example: see GEOM_Spanner.py
- +
F1,F2 Two opposite faces for the hexahedral solid.
F1,F2 Two opposite faces for the hexahedral solid.
Returns:
New GEOM_Object, containing the created solid.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -7063,7 +7080,7 @@ Example: see GEOM_Spanner.py
GetPoint def geompy::GetPoint ( theShape ,   theShape,
theX ,   theX,
theY ,   theY,
theZ ,   theZ,
theEpsilon   theEpsilon
) 
- +

Parameters:
  @@ -7073,40 +7090,40 @@ Example: see GEOM_Spanner.py
- - - + + +
theShape Block or a compound of blocks.
theX,theY,theZ Coordinates of the sought vertex.
theEpsilon Maximum allowed distance between the resulting vertex and point with the given coordinates.
theShape Block or a compound of blocks.
theX,theY,theZ Coordinates of the sought vertex.
theEpsilon Maximum allowed distance between the resulting vertex and point with the given coordinates.
Returns:
New GEOM_Object, containing the found vertex.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -7114,7 +7131,7 @@ Example: see GEOM_TestOthers.py
GetEdge def geompy::GetEdge ( theShape ,   theShape,
thePoint1 ,   thePoint1,
thePoint2   thePoint2
) 
- +

Parameters:
  @@ -7124,33 +7141,33 @@ Example: see GEOM_TestOthers.py
- - + +
theShape Block or a compound of blocks.
thePoint1,thePoint2 Points, close to the ends of the desired edge.
theShape Block or a compound of blocks.
thePoint1,thePoint2 Points, close to the ends of the desired edge.
Returns:
New GEOM_Object, containing the found edge.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - + @@ -7158,7 +7175,7 @@ Example: see GEOM_Spanner.py
GetEdgeNearPoint def geompy::GetEdgeNearPoint ( theShape ,   theShape,
thePoint   thePoint
) 
- +

Parameters:
  @@ -7168,51 +7185,51 @@ Example: see GEOM_Spanner.py
- - + +
theShape Block or a compound of blocks.
thePoint Point, close to the desired edge.
theShape Block or a compound of blocks.
thePoint Point, close to the desired edge.
Returns:
New GEOM_Object, containing the found edge.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -7220,7 +7237,7 @@ Example: see GEOM_TestOthers.py
GetFaceByPoints def geompy::GetFaceByPoints ( theShape ,   theShape,
thePoint1 ,   thePoint1,
thePoint2 ,   thePoint2,
thePoint3 ,   thePoint3,
thePoint4   thePoint4
) 
- +

Parameters:
  @@ -7230,39 +7247,39 @@ Example: see GEOM_TestOthers.py
- - + +
theShape Block or a compound of blocks.
thePoint1-thePoint4 Points, close to the corners of the desired face.
theShape Block or a compound of blocks.
thePoint1-thePoint4 Points, close to the corners of the desired face.
Returns:
New GEOM_Object, containing the found face.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - - - + + + - + @@ -7270,7 +7287,7 @@ Example: see GEOM_Spanner.py
GetFaceByEdges def geompy::GetFaceByEdges ( theShape ,   theShape,
theEdge1 ,   theEdge1,
theEdge2   theEdge2
) 
- +

Parameters:
  @@ -7280,33 +7297,33 @@ Example: see GEOM_Spanner.py
- - + +
theShape Block or a compound of blocks.
theEdge1,theEdge2 Edges, close to the edges of the desired face.
theShape Block or a compound of blocks.
theEdge1,theEdge2 Edges, close to the edges of the desired face.
Returns:
New GEOM_Object, containing the found face.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - + @@ -7314,7 +7331,7 @@ Example: see GEOM_Spanner.py
GetOppositeFace def geompy::GetOppositeFace ( theBlock ,   theBlock,
theFace   theFace
) 
- +

Parameters:
  @@ -7324,33 +7341,33 @@ Example: see GEOM_Spanner.py
- - + +
theBlock Must be a hexahedral solid.
theFace Face of theBlock, opposite to the desired face.
theBlock Must be a hexahedral solid.
theFace Face of theBlock, opposite to the desired face.
Returns:
New GEOM_Object, containing the found face.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - + @@ -7358,7 +7375,7 @@ Example: see GEOM_Spanner.py
GetFaceNearPoint def geompy::GetFaceNearPoint ( theShape ,   theShape,
thePoint   thePoint
) 
- +

Parameters:
  @@ -7368,33 +7385,33 @@ Example: see GEOM_Spanner.py
- - + +
theShape Block or a compound of blocks.
thePoint Point, close to the desired face.
theShape Block or a compound of blocks.
thePoint Point, close to the desired face.
Returns:
New GEOM_Object, containing the found face.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - + @@ -7402,7 +7419,7 @@ Example: see GEOM_Spanner.py
GetFaceByNormale def geompy::GetFaceByNormale ( theBlock ,   theBlock,
theVector   theVector
) 
- +

Parameters:
  @@ -7412,24 +7429,24 @@ Example: see GEOM_Spanner.py
- - + +
theShape Block or a compound of blocks.
theVector Vector, close to the normale of the desired face.
theShape Block or a compound of blocks.
theVector Vector, close to the normale of the desired face.
Returns:
New GEOM_Object, containing the found face.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + @@ -7437,7 +7454,7 @@ Example: see GEOM_Spanner.py
CheckCompoundOfBlocks def geompy::CheckCompoundOfBlocks ( theCompound    theCompound  ) 
- +
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.
    Parameters:
  @@ -7448,7 +7465,7 @@ Example: see GEOM_Spanner.py
- +
theCompound The compound to check.
theCompound The compound to check.
Returns:
TRUE, if the given shape is a compound of blocks. If theCompound is not valid, prints all discovered errors.
@@ -7456,16 +7473,16 @@ Example: see GEOM_Spanner.py
-

- +

+

- + - - + + @@ -7473,7 +7490,7 @@ Example: see GEOM_Spanner.py
RemoveExtraEdges def geompy::RemoveExtraEdges ( theShape    theShape  ) 
- +
  @@ -7483,23 +7500,23 @@ Example: see GEOM_Spanner.py

Unite faces and edges, sharing one surface.

Parameters:
- +
theShape The compound or single solid to remove irregular edges from.
theShape The compound or single solid to remove irregular edges from.
Returns:
Improved shape.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + @@ -7507,7 +7524,7 @@ Example: see GEOM_TestOthers.py
CheckAndImprove def geompy::CheckAndImprove ( theShape    theShape  ) 
- +
Fix all detected errors.
Note:
Single block can be also fixed by this method.
Parameters:
  @@ -7518,38 +7535,38 @@ Example: see GEOM_TestOthers.py
- +
theCompound The compound to check and improve.
theCompound The compound to check and improve.
Returns:
Improved compound.
Example: see GEOM_TestOthers.py
-

- +

+

Example: see GEOM_TestOthers.py
- + - - + + - - - + + + - - - + + + - + @@ -7557,7 +7574,7 @@ Example: see GEOM_TestOthers.py
MakeBlockExplode def geompy::MakeBlockExplode ( theCompound ,   theCompound,
theMinNbFaces ,   theMinNbFaces,
theMaxNbFaces   theMaxNbFaces
) 
- +

Parameters:
  @@ -7567,9 +7584,9 @@ Example: see GEOM_TestOthers.py
- - - + + +
theCompound The compound to explode.
theMinNbFaces If solid has lower number of faces, it is not a block.
theMaxNbFaces If solid has higher number of faces, it is not a block.
theCompound The compound to explode.
theMinNbFaces If solid has lower number of faces, it is not a block.
theMaxNbFaces If solid has higher number of faces, it is not a block.
Note:
If theMaxNbFaces = 0, the maximum number of faces is not restricted.
@@ -7577,25 +7594,25 @@ Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -7603,7 +7620,7 @@ Example: see GEOM_TestOthers.py
GetBlockNearPoint def geompy::GetBlockNearPoint ( theCompound ,   theCompound,
thePoint   thePoint
) 
- +

Parameters:
  @@ -7613,33 +7630,33 @@ Example: see GEOM_TestOthers.py
- - + +
theCompound Compound, to find block in.
thePoint Point, close to the desired block. If the point lays on boundary between some blocks, we return block with nearest center.
theCompound Compound, to find block in.
thePoint Point, close to the desired block. If the point lays on boundary between some blocks, we return block with nearest center.
Returns:
New GEOM_Object, containing the found block.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - + @@ -7647,7 +7664,7 @@ Example: see GEOM_Spanner.py
GetBlockByParts def geompy::GetBlockByParts ( theCompound ,   theCompound,
theParts   theParts
) 
- +

Parameters:
  @@ -7657,33 +7674,33 @@ Example: see GEOM_Spanner.py
- - + +
theCompound Compound, to find block in.
theParts List of faces and/or edges and/or vertices to be parts of the found block.
theCompound Compound, to find block in.
theParts List of faces and/or edges and/or vertices to be parts of the found block.
Returns:
New GEOM_Object, containing the found block.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -7691,7 +7708,7 @@ Example: see GEOM_TestOthers.py
GetBlocksByParts def geompy::GetBlocksByParts ( theCompound ,   theCompound,
theParts   theParts
) 
- +

Parameters:
  @@ -7701,45 +7718,45 @@ Example: see GEOM_TestOthers.py
- - + +
theCompound Compound, to find blocks in.
theParts List of faces and/or edges and/or vertices to be parts of the found blocks.
theCompound Compound, to find blocks in.
theParts List of faces and/or edges and/or vertices to be parts of the found blocks.
Returns:
List of GEOM_Objects, containing the found blocks.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -7747,7 +7764,7 @@ Example: see GEOM_Spanner.py
MakeMultiTransformation1D def geompy::MakeMultiTransformation1D ( Block ,   Block,
DirFace1 ,   DirFace1,
DirFace2 ,   DirFace2,
NbTimes   NbTimes
) 
- +

Transformation is defined so, as to superpose direction faces.

Parameters:
  @@ -7757,66 +7774,66 @@ Example: see GEOM_Spanner.py
- - - - + + + +
Block Hexahedral solid to be multi-transformed.
DirFace1 ID of First direction face.
DirFace2 ID of Second direction face.
NbTimes Quantity of transformations to be done.
Block Hexahedral solid to be multi-transformed.
DirFace1 ID of First direction face.
DirFace2 ID of Second direction face.
NbTimes Quantity of transformations to be done.
-
Note:
Unique ID of sub-shape can be obtained, using method GetSubShapeID().
+
Note:
Unique ID of sub-shape can be obtained, using method GetSubShapeID().
Returns:
New GEOM_Object, containing the result shape.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -7824,7 +7841,7 @@ Example: see GEOM_Spanner.py
MakeMultiTransformation2D def geompy::MakeMultiTransformation2D ( Block ,   Block,
DirFace1U ,   DirFace1U,
DirFace2U ,   DirFace2U,
NbTimesU ,   NbTimesU,
DirFace1V ,   DirFace1V,
DirFace2V ,   DirFace2V,
NbTimesV   NbTimesV
) 
- +

Parameters:
  @@ -7834,26 +7851,26 @@ Example: see GEOM_Spanner.py
- - - - + + + +
Block Hexahedral solid to be multi-transformed.
DirFace1U,DirFace2U IDs of Direction faces for the first transformation.
DirFace1V,DirFace2V IDs of Direction faces for the second transformation.
NbTimesU,NbTimesV Quantity of transformations to be done.
Block Hexahedral solid to be multi-transformed.
DirFace1U,DirFace2U IDs of Direction faces for the first transformation.
DirFace1V,DirFace2V IDs of Direction faces for the second transformation.
NbTimesU,NbTimesV Quantity of transformations to be done.
Returns:
New GEOM_Object, containing the result shape.
Example: see GEOM_Spanner.py
-

- +

+

- + - - + + @@ -7861,7 +7878,7 @@ Example: see GEOM_Spanner.py
Propagate def geompy::Propagate ( theShape    theShape  ) 
- +

Propagation group is a set of all edges, opposite to one (main) edge of this group directly or through other opposite edges. Notion of Opposite Edge make sence only on quadrangle face.

Parameters:
  @@ -7871,32 +7888,32 @@ Example: see GEOM_Spanner.py
- +
theShape Shape to build propagation groups on.
theShape Shape to build propagation groups on.
Returns:
List of GEOM_Objects, each of them is a propagation group.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -7904,7 +7921,7 @@ Example: see GEOM_TestOthers.py
CreateGroup def geompy::CreateGroup ( theMainShape ,   theMainShape,
theShapeType   theShapeType
) 
- +

Parameters:
  @@ -7914,33 +7931,33 @@ Example: see GEOM_TestOthers.py
- - + +
theMainShape is a GEOM object on which the group is selected
theShapeType defines a shape type of the group
theMainShape is a GEOM object on which the group is selected
theShapeType defines a shape type of the group
Returns:
a newly created GEOM group
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -7948,7 +7965,7 @@ Example: see GEOM_TestOthers.py
AddObject def geompy::AddObject ( theGroup ,   theGroup,
theSubShapeID   theSubShapeID
) 
- +

Parameters:
  @@ -7958,33 +7975,33 @@ Example: see GEOM_TestOthers.py
- - + +
theGroup is a GEOM group to which the new sub shape is added
theSubShapeID is a sub shape ID in the main object.
theGroup is a GEOM group to which the new sub shape is added
theSubShapeID is a sub shape ID in the main object.
-
Note:
Use method GetSubShapeID() to get an unique ID of the sub shape
+
Note:
Use method GetSubShapeID() to get an unique ID of the sub shape
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -7992,7 +8009,7 @@ Example: see GEOM_TestOthers.py
RemoveObject def geompy::RemoveObject ( theGroup ,   theGroup,
theSubShapeID   theSubShapeID
) 
- +

Parameters:
  @@ -8002,33 +8019,33 @@ Example: see GEOM_TestOthers.py
- - + +
theGroup is a GEOM group from which the new sub shape is removed
theSubShapeID is a sub shape ID in the main object.
theGroup is a GEOM group from which the new sub shape is removed
theSubShapeID is a sub shape ID in the main object.
-
Note:
Use method GetSubShapeID() to get an unique ID of the sub shape
+
Note:
Use method GetSubShapeID() to get an unique ID of the sub shape
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -8036,7 +8053,7 @@ Example: see GEOM_TestOthers.py
UnionList def geompy::UnionList ( theGroup ,   theGroup,
theSubShapes   theSubShapes
) 
- +

No errors, if some shapes are alredy included.

Parameters:
  @@ -8046,32 +8063,32 @@ Example: see GEOM_TestOthers.py
- - + +
theGroup is a GEOM group to which the new sub shapes are added.
theSubShapes is a list of sub shapes to be added.
theGroup is a GEOM group to which the new sub shapes are added.
theSubShapes is a list of sub shapes to be added.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -8079,7 +8096,7 @@ Example: see GEOM_TestOthers.py
UnionIDs def geompy::UnionIDs ( theGroup ,   theGroup,
theSubShapes   theSubShapes
) 
- +
+Example: see GEOM_TestOthers.py
  @@ -8087,28 +8104,28 @@ Example: see GEOM_TestOthers.py

-

-

- +

+

- + - - + + - - - + + + - + @@ -8116,7 +8133,7 @@ Example: see GEOM_TestOthers.py
DifferenceList def geompy::DifferenceList ( theGroup ,   theGroup,
theSubShapes   theSubShapes
) 
- +

No errors, if some shapes are not included.

Parameters:
  @@ -8126,32 +8143,32 @@ Example: see GEOM_TestOthers.py
- - + +
theGroup is a GEOM group from which the sub-shapes are removed.
theSubShapes is a list of sub-shapes to be removed.
theGroup is a GEOM group from which the sub-shapes are removed.
theSubShapes is a list of sub-shapes to be removed.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - + @@ -8159,7 +8176,7 @@ Example: see GEOM_TestOthers.py
DifferenceIDs def geompy::DifferenceIDs ( theGroup ,   theGroup,
theSubShapes   theSubShapes
) 
- +
+Example: see GEOM_TestOthers.py
  @@ -8167,19 +8184,19 @@ Example: see GEOM_TestOthers.py

-

-

- +

+

- + - - + + @@ -8187,7 +8204,7 @@ Example: see GEOM_TestOthers.py
GetObjectIDs def geompy::GetObjectIDs ( theGroup    theGroup  ) 
- +

Parameters:
  @@ -8197,22 +8214,22 @@ Example: see GEOM_TestOthers.py
- +
theGroup is a GEOM group for which a list of IDs is requested
theGroup is a GEOM group for which a list of IDs is requested
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + @@ -8220,7 +8237,7 @@ Example: see GEOM_TestOthers.py
GetType def geompy::GetType ( theGroup    theGroup  ) 
- +

Parameters:
  @@ -8230,22 +8247,22 @@ Example: see GEOM_TestOthers.py
- +
theGroup is a GEOM group which type is returned.
theGroup is a GEOM group which type is returned.
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + @@ -8253,7 +8270,7 @@ Example: see GEOM_TestOthers.py
GetMainShape def geompy::GetMainShape ( theGroup    theGroup  ) 
- +

Parameters:
  @@ -8263,50 +8280,50 @@ Example: see GEOM_TestOthers.py
- +
theGroup is a GEOM group for which a main shape object is requested
theGroup is a GEOM group for which a main shape object is requested
Returns:
a GEOM object which is a main shape for theGroup
Example: see GEOM_TestOthers.py
-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - - - + + + - + @@ -8314,7 +8331,7 @@ Example: see GEOM_TestOthers.py
GetEdgesByLength def geompy::GetEdgesByLength ( theShape ,   theShape,
min_length ,   min_length,
max_length ,   max_length,
include_min  = 1,   include_min = 1,
include_max  = 1  include_max = 1
) 
- +
+
  @@ -8322,40 +8339,40 @@ Example: see GEOM_TestOthers.py

-If include_min/max == 0, edges with length == min/max_length will not be included in result.

-

- +

+

- + - - + + - - - + + + - - - + + + - - - + + + - + @@ -8363,7 +8380,7 @@ If include_min/max == 0, edges with length == min/max_length will not be include
SelectEdges def geompy::SelectEdges ( min_length ,   min_length,
max_length ,   max_length,
include_min  = 1,   include_min = 1,
include_max  = 1  include_max = 1
) 
- +
+
  @@ -8371,19 +8388,19 @@ If include_min/max == 0, edges with length == min/max_length will not be include

-If include_min/max == 0, edges with length == min/max_length will not be included in result.

-

- +

+

- + - - + + @@ -8391,7 +8408,7 @@ If include_min/max == 0, edges with length == min/max_length will not be include
addPath def geompy::addPath ( Path    Path  ) 
- +
  @@ -8402,8 +8419,835 @@ If include_min/max == 0, edges with length == min/max_length will not be include
-
Generated on Tue Oct 18 00:47:37 2005 for SALOME - GEOM - v.2.1.0 by - -doxygen 1.3.7
- - +

Variable Documentation

+

+ + + + +
+ + + + +
tuple geompy.g = lcc.FindOrLoadComponent("FactoryServer", "GEOM") [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
tuple geompy.geom = g._narrow( GEOM.GEOM_Gen ) [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.myBuilder = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
int geompy.myStudyId = 0 [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.father = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.BasicOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.CurvesOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.PrimOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.ShapesOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.HealOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.InsertOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.BoolOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.TrsfOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.LocalOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.MeasuOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.BlocksOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.GroupOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
dictionary geompy.ShapeType = {"COMPOUND":0, "COMPSOLID":1, "SOLID":2, "SHELL":3, "FACE":4, "WIRE":5, "EDGE":6, "VERTEX":7, "SHAPE":8} [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
tuple geompy.g = lcc.FindOrLoadComponent("FactoryServer", "GEOM") [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
tuple geompy.geom = g._narrow( GEOM.GEOM_Gen ) [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.myBuilder = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
int geompy.myStudyId = 0 [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.father = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.BasicOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.CurvesOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.PrimOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.ShapesOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.HealOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.InsertOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.BoolOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.TrsfOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.LocalOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.MeasuOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.BlocksOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
geompy.GroupOp = None [static]
+
+ + + + + +
+   + + +

+

+

+ + + + +
+ + + + +
dictionary geompy.ShapeType = {"COMPOUND":0, "COMPSOLID":1, "SOLID":2, "SHELL":3, "FACE":4, "WIRE":5, "EDGE":6, "VERTEX":7, "SHAPE":8} [static]
+
+ + + + + +
+   + + +

+

+ + + diff --git a/doc/salome/gui/GEOM/pics/arc.png b/doc/salome/gui/GEOM/pics/arc.png index 260a5fb7d6a00b9c4fb0c1b455c2af336c7211c7..6698477c2a42ed495a9dfa933af575848daf4a47 100755 GIT binary patch delta 13 UcmcZ{eJPryGr-S%BkMU`04fUwe*gdg delta 14 VcmcZvg01&jay diff --git a/doc/salome/gui/GEOM/pics/archimede.png b/doc/salome/gui/GEOM/pics/archimede.png index cd620020e4e2159eb4888c2eacfe267efc1a3765..671d53e4c90beec7eb75e01fb7ed8e6c937dfd96 100755 GIT binary patch delta 17 YcmX?Kezu&YGr-S%Bdfpl07ORy+5i9m delta 20 bcmX?Ge!iTwGr-TCcO#3xH6!ojVCyOXQ;`Pq diff --git a/doc/salome/gui/GEOM/pics/archimedesn1.png b/doc/salome/gui/GEOM/pics/archimedesn1.png index 402092052787db07dbd458ed24104632937e32b2..b403afd0baa8843012125aad4b8e7753df89d196 100755 GIT binary patch delta 13 Ucmca7b619?Gr-S%BWold03@IUg8%>k delta 14 VcmcaBb5Dk~Gr-TCcOy$A9{?y!1dsp# diff --git a/doc/salome/gui/GEOM/pics/archimedesn2.png b/doc/salome/gui/GEOM/pics/archimedesn2.png index b3b84b155b3cf1df96dc019203969933bf825104..6edc4e90033ff7706fd244ac059716c95a9f8692 100755 GIT binary patch delta 13 UcmZ3Zuv&qoGr-S%BdfXq03YT9_W%F@ delta 14 VcmZ3juttHkGr-TCcO#3s001L41Oxy8 diff --git a/doc/salome/gui/GEOM/pics/archimedesn3.png b/doc/salome/gui/GEOM/pics/archimedesn3.png index da57c0fb966fab409a3f0b3e876563e6e782d314..aba48c5f132bc956670731cc5da5721f4e9e5944 100755 GIT binary patch delta 13 UcmdnUw}FqPGr-S%BdZQO03Oo=*#H0l delta 14 VcmdnMw~>#vGr-TCcO#1qI{+dH1Lgn# diff --git a/doc/salome/gui/GEOM/pics/arcsn.png b/doc/salome/gui/GEOM/pics/arcsn.png index 4131e41f5e63a242e953c27a9dda2992f0595997..6536dc8397b363712096a37f3644e8f40703a51c 100755 GIT binary patch delta 13 UcmeC+ZRcg_4DfT`$lA;X02`76+W-In delta 14 VcmZqY?cinY4DfU3-N@3+1^^y(1Lyz% diff --git a/doc/salome/gui/GEOM/pics/bezier.png b/doc/salome/gui/GEOM/pics/bezier.png index 3c0e8df2b69292fb503584a104246bcc7b204e2a..eaf38aa7e92b83107b0d2d7f75f3d61d5230bdec 100755 GIT binary patch delta 13 UcmeAY?i6O}4DfT`$lA&Y031yN@Bjb+ delta 14 VcmeAa?h>5I1N{I1 diff --git a/doc/salome/gui/GEOM/pics/block1.png b/doc/salome/gui/GEOM/pics/block1.png index 71a93b0c9bd2d768396d783b5aa5ae7a4cde33b0..0a853aa394003cfdf63874e5669a0d122e01e3f3 100755 GIT binary patch delta 23 fcmexT^|6YjGr-S%BWpeL=2m8J>CG4A7RvzueF_PP delta 28 icmexZ^`(lnGr-TCcOy$ZGb8WjW@c|`Aazb|u^a%LiV3U$ diff --git a/doc/salome/gui/GEOM/pics/block2.png b/doc/salome/gui/GEOM/pics/block2.png index c66dd7f0286463bb7c281873ffa336ac8d97e9df..2d2ef11205f619422bbbdbea599fd6c3b59b8a2f 100755 GIT binary patch delta 42 ocmeyC|0SQLGr-S%BWsY-7X>^3 delta 16 XcmX@w#CWWUk+n0x&z*N8i=!g|GhhWt diff --git a/doc/salome/gui/GEOM/pics/block_explodesn.png b/doc/salome/gui/GEOM/pics/block_explodesn.png index 372de3f20556188daeb90ab5437c299eef920095..87011df6ae72de0f9a346dd16f1f5af57337e9de 100755 GIT binary patch delta 20 bcmbQ!!8ogfk)<=h&wV57OOws-O?3GIP<#iV delta 23 ecmbQ$!8oUbk+n0x&z*N8%S#hR-py}Kbol{bJqNh} diff --git a/doc/salome/gui/GEOM/pics/bool1.png b/doc/salome/gui/GEOM/pics/bool1.png index 3f997a772f3cff99490112abddee31418f5addf3..452ae47834b77b633cde1d715260382ec86ecb19 100755 GIT binary patch delta 13 UcmZooZb@e84DfT`$l72C03y=_sQ>@~ delta 14 VcmZokZcS$G4DfU3-N@2l2mmHq1hxPG diff --git a/doc/salome/gui/GEOM/pics/bool2.png b/doc/salome/gui/GEOM/pics/bool2.png index 4e9b968622f6087d707521eb3f79ef268c368ba5..b2de72f5752bd422cc7ab8d49224797ec54559f1 100755 GIT binary patch delta 13 UcmaEw{v@5HGr-S%BkKcW04(hV(*OVf delta 14 VcmaEo{xqGnGr-TCcO%OKV*oKd1>gVx diff --git a/doc/salome/gui/GEOM/pics/bool3.png b/doc/salome/gui/GEOM/pics/bool3.png index af409a15e4f92d69e4b5ea3925d8b031a75b79f0..7022d26f19819019e6b5bf02fef90bd0af12118a 100755 GIT binary patch delta 13 UcmZoj|DVRv8Q|x>k+s?w04N~^BLDyZ delta 14 VcmeyL){xHH8Q|y6yOE{Z7yvCK1uy^r diff --git a/doc/salome/gui/GEOM/pics/box1.png b/doc/salome/gui/GEOM/pics/box1.png index 812027dcf19b8d83a87aa94c131cc91382212e21..3e7d0bfbd95beecba3846e0662427da126b628b3 100755 GIT binary patch delta 18 Zcmewp{VSTKGr-S%BdaarW@pBoIsi-+2JZj> delta 21 ccmewr{U@5WGr-TCcO#1}BO~u-N5-8x09!@}2mk;8 diff --git a/doc/salome/gui/GEOM/pics/box2.png b/doc/salome/gui/GEOM/pics/box2.png index 85a737afb6347f3d7445455c6dc39c9ff42f4321..f00ab1633cd61a5640017314ab03bf9c7527cff3 100755 GIT binary patch delta 13 UcmdlUw=IsPGr-S%Bdd`<048??vj6}9 delta 14 VcmdlMw>^%vGr-TCcO#3DJ^(6N1i%0Q diff --git a/doc/salome/gui/GEOM/pics/boxes.png b/doc/salome/gui/GEOM/pics/boxes.png index f2fad497e5c5fdb06858958cda5b48c16f636be0..2fdd9bc0e05e7693b0a0ca6d4493b4a9f4f8d4c1 100755 GIT binary patch delta 13 UcmeCQ>9Aqx4DfT`$jTxI03OZ*)Bpeg delta 14 VcmeCM>9k?(4DfU3-N?cs2LK`v1K|Jw diff --git a/doc/salome/gui/GEOM/pics/chamfer1.png b/doc/salome/gui/GEOM/pics/chamfer1.png index 94fedcd124181fc169e0b0978bcadb428ad93431..a79553adc54bf2c22d4c4559c05a92daded274ef 100755 GIT binary patch delta 13 Ucmey8@i~K~Gr-S%BWu1104<6Ig8%>k delta 14 VcmeyI@g;+`Gr-TCcOy%_2>>zr1&{y$ diff --git a/doc/salome/gui/GEOM/pics/chamfer2.png b/doc/salome/gui/GEOM/pics/chamfer2.png index b2c09870e95c1ffde3dec3c9b9173c33367b9dea..7acf59a39a5523df49384fc0e050b6fdf26b7060 100755 GIT binary patch delta 13 UcmZ2pxvY|1hN1C diff --git a/doc/salome/gui/GEOM/pics/circle1.png b/doc/salome/gui/GEOM/pics/circle1.png index 840a259735c2a8eaf844bcd62979f2dc5eaedee4..a49fb1b081ca20d10d75ad959b6d9abc19a9887a 100755 GIT binary patch delta 23 ecmdm%x;d4lGr-S%BdZmT?MwZS1KlhESictVCas^oc delta 16 XcmZ3wg>l&yM%K;%KX=}ZEQ(P8G~Weg diff --git a/doc/salome/gui/GEOM/pics/commonsn.png b/doc/salome/gui/GEOM/pics/commonsn.png index e5c0c413194a84507a06b3b4d7beec62bceedb37..7e924edcddbb1703264ce790719ea5f164ca34f8 100755 GIT binary patch delta 13 UcmZ1_yHb{=Gr-S%BkNK=03dDzX#fBK delta 14 VcmZ1}yGoX|Gr-TCcO%PEJ^&-M1a<%b diff --git a/doc/salome/gui/GEOM/pics/compoundsn.png b/doc/salome/gui/GEOM/pics/compoundsn.png index 33e1012edfc52e977657dc3ea0a8f2da988bb778..7a8e4c1755d69e55e0f04af914d52b1bcc611d00 100755 GIT binary patch delta 13 Ucmey$^M!|{Gr-S%BWnR0040tDpa1{> delta 14 Vcmeyu^Oc9SGr-TCcOy#y8vrRt1g!u7 diff --git a/doc/salome/gui/GEOM/pics/cone1.png b/doc/salome/gui/GEOM/pics/cone1.png index f5a95922addd087c2a81a1cbddfce7f2c021e664..3972e1c56e9b57d8a4d901a2aaa6a7cdef620d51 100755 GIT binary patch delta 13 Ucmdl`w7!U?Gr-S%BdfM004IY4&;S4c delta 14 VcmZ2qw4sQ#Gr-TCcO#3oB>*db1l<4t diff --git a/doc/salome/gui/GEOM/pics/cone2.png b/doc/salome/gui/GEOM/pics/cone2.png index 1b058214021a13831fe8058f41a5a203f43ddb10..8ef906b23a10ecf9fcdcffdc8bdee8231b79a0e1 100755 GIT binary patch delta 13 UcmaEx@g{?%Gr-S%BWs2U04&r6ZU6uP delta 14 VcmaEp@iv3CGr-TCcOy%N2>>xR1$zJh diff --git a/doc/salome/gui/GEOM/pics/cones.png b/doc/salome/gui/GEOM/pics/cones.png index 4c8108ce150bc09b0d564a0e27914fa27255be14..0850c78409eb2b59fea3e884ea79c496c0083307 100755 GIT binary patch delta 13 UcmdlIyg8VqGr-S%BkOui046a74gdfE delta 14 VcmdlSyd{{mGr-TCcO%PsO#mtP1sebW diff --git a/doc/salome/gui/GEOM/pics/creategroup.png b/doc/salome/gui/GEOM/pics/creategroup.png deleted file mode 100755 index 85c6bc550b885baf644e0aaa9ff79d53e2af62d1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15350 zcmb8W1yoht-Y>iXK|)GOMCw66X;HdckPzusNhzsKmxMHkG;BgpV$^&w0;%@4e?60~mwNT5GN~*PQ?VuLydpD1(dr7#jkC;L5(1dT>PaT`;=45@x?6j@ZE3kiliHBWO2o*fBqn@ zo`IK@$P||D&E(bLhe6)bVk@u%PI-6g4@-wL(aD6X7N%Z3^^NLlw$30BhsD;*U|%>~ zO02A`Jd=}_{>p#Djts$e?u2IPW6}DF*}fm1;&_I45=@l5)SR(pn=1`7f8^+NFGYpI zSBzykNw49a+iAk5M@+f7#p-;DY-!HxT@0ZFdf)X67aZNtM6;X&Ij69ArZ||`9=Pta z;l2I6EVf^qaXhIU{W$Lo6Q0bVEx^l9XN)NAoxbhaGJhcLi((NoB4U85i1}eSx2RWWQyt6Yee==U&v{YDshmy!mAA92yTH0c=;uk|tnVA@wl8Iw0 zR4Z~MdNCdw#ic)+t9JrpN3G*M!;M3|dOU%`B<Q%C!%zrQOERw3Ms}TOB_R$GD4VF7J^m@9+5R zX^(evb=qq73M>>j+$TM4`v(Das_0;f&{VZO<01pm?8o%YxP_nDZC}d&j95;M_w<s4svKRDj|EkJH_>tVwLPfr^aQ0^gI#86d@@TuRR!#F9n^R(kE4x-~YdF-E` z8JvEt2D^A3kY4xEfuGV}rg9`-hZwzw1`ekz^Hvc)$2Q*e>BkP#_Rku zPhs_y$*7da^{(vpAUH0cMNz)MlVc5Zejbb!05fzo< z$B%#E$;^tZVff<3GNDY zm3Qd0FnW_oDIqoW;82E4vASjw3&nwHoc8uJAC$D3j#ZJX-$x01wyFd&4SV8edy`Gx z9tH<0?eBX&Qu#XUKXgp%!QyS!F`t$e(9ru6r;|1C>*9it?W)l9_vV8>4_l$>2G=k1 za|ePJ^N*Cy;_h!)1U08kd_l#iZ~5N1yRg7+9NK73qY<$qqvfC6WrH^DNWC7WR-53U z@EB65HxVK9i*Ux{*adeyf47m1x~WWSuo!{hf+1@=IpWhbPxAxN-lY7>gvZ;nHKuYg zb9UbzL42>Eoo2s3IMrai+;X|B-`x>enbj&Xkz&wL94I(;?GKh$&+j&TKd+gdAuotr z<377p9nSQ8n4Y1vl!1wZ-@0lCCi9D8Rx6kl>*3=m3ypm_;^{#@f)vQ8J)As_;grmYib_9yC>*SJ|&gy}5t%nj*UANF!yb5qU(Np7He?6j|ziGo{mZF1Pe{ zkKvYcU2LvI>0{4DY4v^sVzPJ}a%^zz=jBybHBh5Gi@2JOd_>lLHK=d;wnKh^BC&0W z&roq7p{Z+nE^BSY&2x3L))_iwP>sCp)J#3bHDse`_qi;+Tu!aDQ6Id8px{OY53(<4 z%gq?91gfxfMsa%yikG9yeKTxqMzn&CxeA5XsksGG-sh2DJnquGJY^NEm%afHvKS|egwpoMafZaZ?D)_eB_PrdR_MeY7=l?&YxD&Lq#7_aObrOo{(ann!e<D?iB^TeT5G4^cIrltAY)ui z!SM8n?HB(3i`h08jkRGhdisW~;OJ>6lUv6;lG*{=S@mLhMz4;`3lrj6-_Tw{LDbys zT`Eu)lg+47$hBPAd$n)a@e3KSl}9_LDy`OSs+tUiGLKtM1sG5*Os$h1cI6_Pi96Fg zXRECpup>lnd6k3aZoW`O1f+(m+T5tMPBn_efgWblPNMOiS)}Eq7gcvx5~+>N`eWB~ z*^k5JbCD`x%c@yV1mDeV)Rf1$AeQUvE{1z&&S#t^p|+AIPg;hZDlgU%v8T?0*Y0IL zID@i_&PGfU@7(MTUh{F0G+xDlF8b4{aD#u}el%N|*bjdRR(8+xwtVkM{9bFJzvI=} zW)Rqwi#Ejra`}NPdw=+?mdXtO0jGD3% z;94Pt1teA@8EeY--!i!Zyft) zJ3Z6<^Mf^++H5MTm3n`qf0UW|6Q+IllBAHqGYqv|V`}$XiWHYU7hSmrk;+4Tt|yf8 zrU|zEv+gx}i~tW#mK5$G>UJxpAGyw%)wFjUt#{5fKZ?=JlBY#wJuixhY~*@4T`zEn zjy`E&9vB!1S%?jA;;z z+Y5WS8wo6aSd7+)uGHin?Pr^}y+=<+Cvn4deKxWeAD#)Pk~=QRVf*uCfFL}5V>8n6 z<%btHkPDYx;&&Yl;q^-d^oV(xA@YMNN(X9=@IWewXM6{=XGel3A7+OF+CMViM#lf_ z4U(<#$w;DNs6)`CyG2+#%(}AvxQ;7Vy-oB@$CnsN3Y4vZ4cDoikQb-v>v*oUH8lR% zP{^iY6dJKUtgJMfKrUtTD;mvweulVIQB{*tCLSo!4bH70i0GA`SrBE?*aF8nGu{x#bC&AI?Q*Xm?36>K&V`=FP>~^ye1|@=qBV5lS7Whm`33vvDDcg&b=~y|!+lf`?n`!rDn>ze^}aYS$D_ z0Az{K!d*}H91P@ku|K7PV{;Ql335*=5Vk0(sU3yD$tQVY%Wms8hBEHcGs-=C&U$Eo zx$nSVJZ1Sr#1jTkJ^>L?E4V>%c?TZh>yIM)Ua`{)-jBUIGv2+`RWP?>`Gi(yOh!Vg ztf?8;yDF|stjk6=Ha2#5vP1wLAth0NAR(PLOYMsn1-lPznx8H*@MjET3*3)T{TBVG zKkc@@=%fPjR#{mLEF8Q5-^9enq0)5EpFh{NX-40`WdP68*}H!$YWr!#>E3y)-X43c zQtI4>13wcJQ_+;==;-KMJ-smf!YnW3t**n66gZ`%QLyRzc?FM-qX!tXB#6n+Oc(jn zTE2!MtS?G~^itY-Vb(7+G*mKc68VfKcqn5#~iiJiQm?*lHol$nmfv79lSn>5jtv_gGG@J zdatbYS~Fwu()yX47Pt`U6;aUo5ts(wgAs_AJ{BxkTQ67f8N#FW zN!YSw3XXHAi5ir&npMg1CrEz@Pc@$Nu)%0|t2LnY!~Aesx-%+V<*17d?jTwAhDD${ z2o8HPD%*ucE3UE2a=b7tIrg0Kvl&}bj(Fg2HGy75beO)60w&>=xoJYwA3E?1n6{^- zeUP+cp2Rg&3Q5of!Gb2BcW?u~33 zHAmq*;&(91oomh0D!pi>zHMqJGw7?`Z|FT-?$j!?QLf$klq2FtkRO$ttk7KSGs3i7 zhBh$qE%V}WmEEe`oF~GnpmEQ2X=%9%d5e&J{rZ62>6n%0IF8TjgD4WE?&RnVF$qaA zc!~#<{Lx28b{JXsCIc`&NGPR1>}ABD>F%F$!Gk6=_tP?1MWTf{c(72 zwlt10#TivfS+mhoNQFUZu`^lZY90UaE6iWx%Hf1`(nUMv#*#8J8KVLME*JEzD37?z ziJj(b86mY!`zE7ZDu|&ISD}2ak8PM#ZaXg=_vaKOCGW|~%I+4dJ0O?9x>pQ9*L_3E zqUk;L(PXmd!->LPh@!^%c#B-UMAb;9qTz9De_Lm#{m$fzInBebUUTEDI^B;FnmfWM z$T{9aAZYjTjM{@qex4}(NK5mE!C>l@3RxpBO!^*~%)Io?%Tq~;r__re_^Sw&)P}w8 z0u^8Agn%Ift8%(OeVvS}_IkH+ejvJAg+r(BL~cV$4oR$D*MNFpjlrf{MUXqz)8dbV zqIuo&5lpeHrsgB=q_C+{)5;u=<&LoB|#SOj=aN_b5EzF~5vKO8wqGx~@NdWM;XR+Rzr2Ww(3ws719cUos<4{wz~z|{b#|`u za+MjS^TSN>M%R_uoG3I1h^uzLw9|Jx}NZc&;@4EC9RJ=rb6h^<_ zEPod+^wW3wS3ChHvrkHMBRvnk-+gWHied52v)hcp)xrk$nHqnKp0)-@1Shx~>IOtZ z8M@Y+b2AXlA1hw*73R(qh%BJQL7ifeWZ7^iwdzJKqpr*hys8vORm4xc3aTpd>fHb9 zz|F6{jX|(^7K46?aK{UuE3Ly!-blRp&8@tReCRPE2+z`6g`Tn7sqoiOo8$Zv-puwi z+j)cgXu_mj3FN|1xuvn38JDmv1O zu$r5HC}*(KarL920u1_fI$HELQ@@We4cUcv6X9_D)CM{8sG> zutSzatj%kJSx~cwnK*0TK zP)V!YoFw&T-ZbyVob|35_j{XO&Ol4x{$ECJbm51Ns>k7Z;1O9m;x&TY*=?wa+zw zA*%_FN|vJW`ap7YOw8d-%X-y83l4=CQeK(F@on>TdZDJ*OK$pLUUZ?Yn(V72!TiGYe4 z13!ZP-hlz(-6R)>uA7C#TH|-k#i-#=_{5R7Hz-|G-&%jlMqM9!d_lKaRnsW>(29|A z;iY7=`77>7VSs1GY2M?mwD*sTIPPeI(vn(kF>%y{hX1Pix}Rsh&#H2^qsn&qdL%eF zSo5go;a5CLITsf`-;w(WG`xifuWP#VIXCtkw0DIKkL?thPq>-??}`zNB{ZTN4~y6AwnDbv?R>523)%xJ!T87w>F);LBF4<=t=?)U zud-FIJj8p#+f?+S6;kDV(f(x8D^1J=4j;e#*N$KswabwpKV#F1Yvkq3d;&Mt!}IW1@aTX}Qd07*ic0HoNb30@h0`)`$1F!Ub3s-5 z0RPm~6wCi=A4ygrLuOB3zKr_ZaEakP{kbvuc~sW>iulc#-yzYr&-0u;(7|BV6|i=8 z788Im{QUhtlupG92^8Iz_ak6c;pF5T-5kk^N=)n-|J-QUA*2O83n_oPy_bhKMLwxt zjxUHwTlPb!`r`|oXKZX3?{_tjCf&X4{^)jZMv@~? z{|OW#|1Vu(Megf>^xg@rq|LpnbZ<6t8yY7BK|1p{1yulc|7An}v%RP{p(#?$Gx}jh zr-d%?_bww;)mFze3|8xo2Mj@1hk;i%W7|m?9UXn|mk?WA$jQk`+9<0ZDLVavd&GXO z)l`XbXtm`7q7J2n#Cg5e5han`RDh73w{o(ouHd-|!XEskCId@7#TwtCPNa8;YsoK2 z{*lNRTb@wE^S#-8>rSvWFBW|9H7l(t=RFau0**U0+}yFBMlzw3ZdUo{^Ioa;1AGB9 zGc(>3tbXd~tCI7g!VQIdIAm-qQA)zJ+}xxG!sHf*OYP8DWnzD=Qj=nFHSv8eog90X$Q&SVRmQp4ZNy(uUjo z%9umxY4>z#sOKl{2+|9)-!u>a4tirW^fyyA5JP^A$eVpI3@&^9$wR}A(8b)shL1-p z-8+-T8B<4vwR`-e?D~C;x2NoTHQNOyai8DR`V-_6mAxrvP=s~mSI%r9UH*)IvYabP zxVUf*rxfU*V4gEm$HF%C%EdXiePghQK?OybOTM;WAFwKdDQ3|L2_=V7@Sq-m62;+s02T<~ z0z8=YxD?!wgVPCvs95!L+6nQ%m+T94RevHbl1>6-<*!R)2>#01NXJI^Z3n^}Uw49s|llnU-KEob=m~%hw z2VT~9i^BSf0e+xkvPB4;Jz8B|1uv~m&x%;Q%pk5l2@}Te&0#T~$3J2b!QzpW-1-&Q z5KK>4>~Uq|O+WG~h%x1$@pjt)`DcxLY`%{~yew6>+ve+oM;vL*Wvn_CY0u<*ksT4# z)PAJcKRonY?>RAmA-LkX-7jp&e_#=ca{2%arXKfzw>qhiKu;oWMiO^LXwjdbd4yiZ zMm(@U>_38Q(5|3{^8JQ8me>C2K1}!QDIi;SUAcsjR??LIj?expy8CZ;>c0cQJa2Ru zKxT^pR0S`0!OxD56=hZW79N-Fao2lW^R~-X6xCn{YE@e6)%I*+7P7eb{}h%59HiW3 zHuKM)8HB|fKC9iAKN5m4j=#V(W28SOFZADa_j_X{mEGxwe8rua#yJgN9m~QgW^8fjC zUw3>~tAD@%v@_&3VO;q8kq(8>$3nrZNtHI;fp0Eu5&K#dmgM`$8;_->rR=;sqZ8wd zgqNmxkmon=y4brqKUQ!czD&8_dZk9Cqzr_x*H5Ogsl*4JZco^cDDXsr&&Uisl}&FA zBZNCL6_Q>nDXssCGcYgF51DEi%~82?vW$(51uGBu*y;|%&vvIf>#C36s*z-kbo(%p zaX4)J#@L-Kw;%(wW(GQ;H{)?W3q>s`KEEpVI z8UVZFi+B147+i|W8M!B7dfqY7)6L^@J5Rqpv8(GfV4c;V-yCO&++dkq+S8Y@3kV=i zKCgiV|Dypk@vZTEov}E5{d81wPchG2WbI~V(&*YnEZQhQ1n{U^4%vS8E{)Iir|QuD zKU_>{x0`z+ITqsu%EvfIWA%u$@lU?{Txp*5dlsjnb6*&ytE_MMPY1f4;G3J9<{e!R zpr@U=+tJ6THHBloB9teE^Q!gUHGrXVHPRS(Ad)M`nk6uDFVQcz_|{<=)?HI+Yh)|A z289T1N@T+m1&pCI8xU45r#GZ1=C-!Q+Pb=V4UI?C=D>9R^C2la zU-l2Ui6|$U2;jKcov(8mbrC@R3$RGk_4=JA_DpW%_;<}Su$h-{s=B3rvEAG!z z^6u_}o#B+rVI-elReRe1ZyfoN+|6lHuG4mGzENo3d%#FRIf8h9LAzh_u^s!}Ro2_L zZ$%Xq6@9raCyTz=4+_Oq&bv??d>y8AnrXf%-9Mi&Xr#Pr7T`=>$0=jWxw7in{Xvt` z!(R5r(S$WO>UsBLT;E{~6psBNmp(TK{ojb)(m~-DQPDiS3g+I2c`de+IdA+3 z;2>A1nzbesYRsNmO@fovO(Q`sZZj`0u~`&{kTw>@gFXC^l=N%Ai6Ll9xINbgt@sJN zpVE=*;H?u;QubFMEtk{h^+(MF03_5h8BFO9DQ34j`#fMhf%vb8EY;(TJcN`rJw4sW zKZLZRdZxocwNZ2U*yOp3W_~M^>?JflLker1uCx$kg!rdyJAA3@BNIr>zRo zcH;MV7l49>FQR(h{1?8+iA||Mm&bPbc$|TI_kO`GB~N&5WNu+iB6NGaJQwzMShK2o z4Nf4&+g0R&a0Ie2hA&E7Z##e_+PdrO5+ao~*8t}n{_lca*2s!tevS>1_`MHA(6(Q6 zlVwA0`?vqIu0u3IQNLq|euqR=YfcjfCnHLT3E9m!ROiON5Hj|)t=xjOIr4LE?S|)l zZD87S3JMqi&|q)4P9M1Lr1A*OEvO47KkqZExGUrt$5gAC6rY!lUc{Axx(vB1<84?( z2^^lN%hr!N_hxGaik$vr{<1lybS6m8#ddC*<=vAO*1jQx0M_^dY!bAz?Ce1LLY75e ze36BlnEm775O%Jb+dF;;k5E5szEAy%-wOz8JJXdB+l93$vQZ4S8^3?>AAfFGH4(mD zF%$+Xm~@*Gkl$Qk?RE)#kv24ZK}b`do9WStiqcVY0QEs%=^)4PTte0u^)5Xf53M%o zfx_tjy~bHwVV(J6;F_Odox7dytOBGWs!TjyXfOy=tqa@r2!(=q-TGE`a=fN&<&3K1 zZ~>IbdN-a7>F^`=jEU{(gFS(-en|jV9(bz|`@e{bSUkLpcx*(5uZD^R)^Jso~ zVWXp?gQQSdHNIlN-9Ti~%;eTjoao~8U7v6BZKMomc5zy88V0=+U zMI4sg6s4wv*2}f~ybrC#U$Lj5tRpxxPn13ty{u~h;^=3N#$V8;+U{z{-9IMVg&@IE z9q~$gf2P`A>$+tL!x-kaSM7e?-5C~3{Tf`LOuj(MO1#nY#%I<~dX;Pi!K1=z65O(z(egK;@?!uZ`w;&_8`>T+ySp(J3Z!s9B(u(}SU04XMiRm{IF3d+hNikO|0%~Q zj6%Bm`W}ECyJ7cq0o4d-7I)07=E;;K$$y~Qpa|g)z|8QBpyFj(K&S~>XX#n5y3rnK zqc-4bGC62RV|Kza|k=lPC0LnIvz0=a_2JGc>HO_$7eSnSr}D0sJ86 zIs&Qnn}zs(lb)U)2w=YqOiXaKQ)+fWMIdB+`t%6`HP|2gm6!J*qEn(!zy9$J0gnco z=v=cPP)F|KV3yn}@3h6GT+l(P3mgLIgsrXZ%G%m+y_?exm*WgoWutKI?3@`gIyUxW zx%SX=evsZ68X7v;7+Ma!-V;|V60zqxyYsPt`*yeO%fvpZs#OXGKOlK%Q+^`5C84H9 zLjQ|?1M2E}wj---O9=XThEl5V(>6xnX7zumL;Lyj=Yj)2%4A$Eerfy6`&*z96=|}7 zz5?d)#RhI$d%Lo#s^pfpDjW{aE>bVkY>eO=+G&*Rf|)V!@WlCD+yj8RNL`c9{elDS z-Teg{UhUHc^SGpM-tkDTY_ zDj5I^HWvqr(ul08s`!&KhZ?8-@ZQ~}i{fQTDXDVvmwCCEXQl<|bv`LVt{-1LK6Dmr z-un7d8nu8_Cd_wFsAdEto#45-Q>nG7C(WCayN*XkM_s+WXmwuD+IEMG3&|G?vk_nd zDf*mvpTraOt7jF3>w$mprRls_>k>5}>^1V#c?_q~E!jos1N?%U1TTAp9Oem%K4 zeFld=oMt^M^ODgf>KlZ?;hOpCz*N1PCx}$LR9joyt4V4y_|paR=S*yWF)?As_4~uK+5dylhQ>S-e>I0SuNUP@(%Jz z+viqtHA2=qj&8|Nun>y`b^yC20>GvDJ&iDJ3JMwq0SSr!$mU8`s;7B{ZrZ?oei4yW zuvO9rgFCD%OY0rnGENiZ8A34(qi$5Rw1R$B`v2^D`ULO3fYaVjw}`#08@J)_?>*PR z6l3AzulpRci)M`|YpHbuopB@PH;%8sUKc)UJkC53>iT)H`QQP%HW>f8}Vip z$RbLWs+<9SV53FH#4XxYzm`*M**vmt0Wa^`D?f?3@y;wxI(b7ht z3<|Hl^OM}Mt$g<9SaH2$M#x7GFz{~NF(DDt67J%Hvxc?yI~T={*N$b+<5R1Tg6+V* z2pZY^`LnD|WcHkV7!|8Z`!71Wps=u0PfXSQvXUdtmey8TMa45Dy(%$!?ihlMjg>WQ zV`D>lT}D#!+xPF{^70ShTeIZ4>iW{azFAscvgM_O;?47@iFmhL-pM+?bKdoZvj&xX zL-J547r-XTiW=*0eka;_+-Ej#43CIlWZ=ih7z&(T?pQt}Af=Ml*QeV2v;Ew0WzmJM+EBFH;r4!rZK*}eBX z5`pSb-b7aKG*ut%FklXu|BEUoiqC0eVuDe^Pdk8l`6M9R8w2Q3WDIQyf2A(}rcKKJ zf4D2w+Hsp`-pS3h_$A0nOzdtkFLy>{jBIiwhTg6wCC;h6 zZo(oIXX;_zn95+3&LE8FTu$}8zOd~JGI2fMRQUAixm(ZqD}nmlZ{9?INdgmh%=}kb zS#)avKH6JVT}iOIKv)5o%!cLKw$)0zNfzd=8nh^kl7ZO(ZVC#*K-+^PE6NzF(bqce zrfZ0^gW{o{OH$h!p5L=(kd?Ek=MP{%Z8}KrrUfeEBj>!v{?E5FUCbHUKn3*#Dp_e;bYeLUR7O zJpUm@fwfG_|7B)I7a#>u^tetbOG_4^nsZFYQt=cpbIEP(t!y2e4ofz?cS?`!R+J=w zC`Cym!{FIBB!iWR4Recs@N5JLGbe&26pS4LGA3#<`t`1aq@)r1=tz#SD8u1DCMY$*4U+DAeCIKe#e2lYxDV0e$2 z8?P56x1ENzT31HJ#mRtr1PM<6&6-Kk&KQgWl767`pom&lYGQ|Aqh#mg05cXqs-{gx zuxc`ODy=~S4yWRi1M&e?WdI;HrNALJ*~T;mGw<+ML&yas-u)LtFXH7H1_aIp!K@ce z??%VQfX2R^x9nI;Q5Oy(bZ|H}Fv>u^WQfAbXbuFCIWx|8-wZ@8&ov!_3)G-~cbk)+ zHd!%X_5R7}4WS_`KX!EojgP>P0`*(P`B z^ORHfTUR1_@7wSvD~uENtjJ;fcTR@y1MxCtfT@d;XtZU)rMR(I4ENhMu_hVJ9UUFh z;19(yX}sxpUBZ77{PlZ<#up@g{@qdk_l3R%w&2Pz36N(U{-7{wJiAN!jNtKBi;H0n zX>|+VrHB6gl)wG@@lVuJ{WSu)bbo-_3pFw|O+C|kOlg;12*Uw|_cbN-P&8n6NMj&? zNZf(D1plAx;{R;x{5?)?tKx|jZphTbuB}(hAdEDrK=9Yod#@HCs%p3nF^Q203EgnD z+(f+&Kr!B0lraM13Q*opj^vy3XBG-b$1?BxPr8itOcPJ`6XfojO#4Sh+J;v2N-pp$ zl28}(Tf@V252Jfzs6Pw+%u?C-d{oq8ND2!VfY)O;TRvgCI>~&wP2qK#>Nhi0P_@xV zSEUhKC;l$=DFE?`xv+up_2xClT9-Sg$h~h>_qf*L;^wq*J%HNtU@-31JUI=vfzwPG zQ&+r%+n{?)52&}4gTpIefXF9sq7zpwhYR?O7i2n&69SCrUUo%i4J1?H%L^g~rGzIt z44*o3-x#bOEVjBIu97_plLkS)YG6zQyf2o8b2X($oAD-mLEq~JO67HJo1T$@5*QTp z;r9Bn?)GXM8mj}mYn3ed_C=d}83~@r(0i2@6Knu~S8W&6ZV77jf2=szsFSJQ>`1!1 zcgyLD{HaahQj`9V0L((_5PP*O+GWpdK4(U`Aa*MgKnMuj0c3c1_ySlF!JW&8?4>|( zxyuW6n1-)kZ5NmVegUa#xQ5<+#-JGARX(BHJN)a-ROM%CB1ULNj2lP2Z)brm8c^ReQ3&Ph664uq1 zq<|_wYz`L0kaa*4DA~$T6FfPPxCXxO}x5*cU}c78Hn@MW|j+31ur`9BWc{!xP#O0L=eHt z(J1$W#ruNCJ1;?$$wYKssmP(5P#4%$mz!CsTk-@W9`x1WKKHC_4nJb)_1z9?kL8WpXUVg)R`ebsc<=7d*O1F_aIoWlG-u%j<_syuty~ujEvm+oveT$FZFks-~iUBi==bf)p$q9^Zh%jR3 zWs1uhd2C|?>^`;ow;YwsyU+iN0bbj&=JgwoQ`h;{UktHy<@j~pc{waTlmVEaM2re~ zrBS-d#CJY8$X<2cX|F9IK0LwLCI(!qt@t8FOFvbTzWD|`VBqIZv_c+Myc7^f0{RS~ zeOgsEKfJ0lGZCQ_JmF4ro&gpG^=o~NL5e%TE?muFOkE1@Eu`V+f9yNdWYMdCydQ?3Bi@CYEGjQA?n*XlWa**lTpu994c*?@^0JwcSQ>DJA#8pY2M6Jw%mO(dJ?Km3iK{+d66MVfPb2HjsiRk*(SBtqn}%8-H_wPppg zfIckQkhrgQ!?B~md`~bB{BKbCr<%c|)m|46M(NUznccC|6SKczc5<+;2Nljj))WDO zf@77at^U;IOkFz7Ldn3lhFj9l=gGS-AHi!@lt(_6u<;r?$q$)(dQ0vv#OKStuQBym$I$X7^du z+47PfXr};=BWai|)>4O`xDJ z(aN~6C(SXjV`-=#VhF{|DhR}16#{vA*EcuY;q5zhG*Ns-3|RjjYSW_SU;+s0*{+o_ z%(#mPz^uJezUac~{WjYEJhTqG3u-vXSz+-YTfG&jgiindo!<(#GP6KR?Jga1eK4); zEu141&;2g^CpNA4peaIOXL>(9FB=lE@SoM1S`^BZS zSMa$PHWM6sy)%D3sFNC}ua-dE3QqVLerVkxa6q#I% z5$V$LC)wDOy%v*5i7)4-#Ki47+3<%-va0&YY3Z04s(fYbZJvoO7sAm#yy1KiYAJ5yyFLitZ0TFkuxYPE9&ad!Ct1v#Ic(QMRfusqu?T5uPTXiRg3c_ihL ScmLrFk(E-EED(S1^FILjP@mEO diff --git a/doc/salome/gui/GEOM/pics/curve.png b/doc/salome/gui/GEOM/pics/curve.png index a9541de0a3e590c8c2f174204f64a64c4491c3de..411a17dd93e7476982bfa31b183302ce918e737d 100755 GIT binary patch delta 13 UcmbOpH7$yzGr-S%Bdd@u03zK4NdN!< delta 14 VcmbOhH9d;8Gr-TCcO#3CE&wKX1Xch5 diff --git a/doc/salome/gui/GEOM/pics/cutsn.png b/doc/salome/gui/GEOM/pics/cutsn.png index eda9bb7123d1d4a3ae57d4c8de8d83c7ba7e2d09..5afd86ebdc371fa11f567df4e9eec70cd5b8ffeb 100755 GIT binary patch delta 13 UcmX@Bc1De*Gr-S%Bddon03*i)X#fBK delta 14 VcmX@3c2*%d1XPw diff --git a/doc/salome/gui/GEOM/pics/cylinders.png b/doc/salome/gui/GEOM/pics/cylinders.png index fc0d43276724ce5471d27a56249ac7bae4f22478..8c97b32b19edc14c5c30f33a6206f51c31b588dd 100755 GIT binary patch delta 13 UcmZ3Ix;T}kGr-S%BkO!40462{3jhEB delta 14 VcmZ3Sx+ImgGr-TCcO%PuBLFGz1sDJT diff --git a/doc/salome/gui/GEOM/pics/disp_mode1sn.png b/doc/salome/gui/GEOM/pics/disp_mode1sn.png index b5b7e8ff299f9cbbbfcdb9008e594c5caa50ae91..9ebbf8efc2ea0d43bc19cb724accb716afa4949f 100755 GIT binary patch delta 13 UcmX?Pf6$(#Gr-S%BkNvy043W61^@s6 delta 14 VcmX?Tf5@J-Gr-TCcO%PQc>pPu1rq=O diff --git a/doc/salome/gui/GEOM/pics/disp_mode2sn.png b/doc/salome/gui/GEOM/pics/disp_mode2sn.png index 36223273990837b3600ae125b3b4b76b4886583f..e6b0ff6b7d8a235d91b6cefdc186601eb63d5680 100755 GIT binary patch delta 15 Wcmdn6fN}i-MwZS1KlhES+5rGBmIXxs delta 16 XcmZ3#fN{eDM%K;%KX=}ZEZPA8Gw%gb diff --git a/doc/salome/gui/GEOM/pics/distance.png b/doc/salome/gui/GEOM/pics/distance.png index 7466fc424f50c9678e0c0aaeee180b70e0fe1644..b766ed25a3c4947c020cccb800b6a23d050adbe4 100755 GIT binary patch delta 13 UcmcbebSsIaGr-S%BWsu;04jL}DF6Tf delta 14 VcmcbWbUTT)Gr-TCcOy%fApkC`1vUTx diff --git a/doc/salome/gui/GEOM/pics/edgesn.png b/doc/salome/gui/GEOM/pics/edgesn.png index 9de8df9efa694a012ad38383201198bdcf97543e..2a6758a56eab941bbad33b07cc59823b80a06368 100755 GIT binary patch delta 13 UcmdnNvz>>fGr-S%BdakR03Tcf=>Px# delta 14 VcmdnavxA4VGr-TCcO#228vr7l1NHy_ diff --git a/doc/salome/gui/GEOM/pics/editgroup.png b/doc/salome/gui/GEOM/pics/editgroup.png index db3e235751c30bf972958ebaaff93fa8bf7fd71c..1e70709ec64c10b4d174188d5b7cf8136a5e856a 100755 GIT binary patch delta 13 UcmaD}^{k4eGr-S%BWsc^04>c0i2wiq delta 14 VcmaD>^}LF;Gr-TCcOy%ZEdVk{1(pB+ diff --git a/doc/salome/gui/GEOM/pics/ellipse.png b/doc/salome/gui/GEOM/pics/ellipse.png index 0888b5021ba27724c0c253d16118e4f3417bbdde..2fb0b7924e81239a03500086536782f22357d410 100755 GIT binary patch delta 13 UcmaEt`8JcKGr-S%BkM~O04@Xt^8f$< delta 14 VcmaEx`7V>SGr-TCcO%P7696)51^@s6 diff --git a/doc/salome/gui/GEOM/pics/ellipsesn.png b/doc/salome/gui/GEOM/pics/ellipsesn.png index 1c421541d20db986ca750ed62d45d32cc3e9f3f9..1973b4e0847992303cd7b536e3163dcbc65d5469 100755 GIT binary patch delta 13 Ucmew?_DPJTGr-S%BWoTv046&Gvj6}9 delta 14 Vcmew)_F0UzGr-TCcOy$4HvlRH1i%0Q diff --git a/doc/salome/gui/GEOM/pics/export.png b/doc/salome/gui/GEOM/pics/export.png deleted file mode 100755 index 7e441f93a4ae1c59a9501c1d8a9b724d2bae6032..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14172 zcmeHu^;cDGyY8fs?ruep?rs*KpoCIN3rI+Jr@*2y0Fg$eOB(4$8j+G*G=g;JdDi=V z;~RUQJ6QwlM~3J5k7SiiDa3O^^EJPK&y zS#^0b$n9z(SlN}TIr-CoBR8kuf#q6;4M$FX0ha)mpld)Np5PEphZ!d3Rig>-r<6*m z^%OzzVXKV8G*@&jGBYA_^5YE*Vq)UAVIMw_we1<2d6AHlv)(K$#WU-9%e~Lk;}^c0 zOo}dNq3vh4e;C-ff0$RH>E)$hkPx4r&pt|Y51fS<9C1Ro&!BMa&-pzL27|414;i&Y zI!vlh7vCJh4}Uk3k!>jM7?2357rk9!DY$0|SHRgM;i3MIvJ2`UF)Jp+Y_Qh0KdyOB^x^Tc_K3 zX=`^0?J{F}mwGyySj^L%IW*{3kpZExafbE1VU=uU*oD7%)%T_T()E&H!}}@$0Vo23 zjB;#ImOL{Fgm~WaU$qsOu~A)Ia2dH*7Zb1vpEDFba3T6K_a?d`d*l!LicOIsnuax_ zu~N0IOfRKvhhk%dUv^xFWHKC{Uq}K89bnK*k}@T8zD-XI8z_D(Wb+gK=H>}vbMsEh zW6W6HP^oH~WL}fD>erK_Sz3y}4)&Fw$#JFe5ue;=cWzPks(5tm;J=TR$IQ& z$k^ud02=&oi2~Q;K>xM(F8g~PU2NfkqUl_OrtYoeZ;G1`N$Ogsl^j$n$B8#57i@dG zBlwhE!Pbal?tnph&53Ju7)*O}{3I#6z6`5Tio7@AW2|8{P2i;g6)GxfmNo}-6bnoX z9UY}Y0`EVK0BgCeC4!D;IlP*Q$mq_a>h-A#k0u%KBYw&6Cs|-OodsLNVbIyUaUZ*brs? z59(Yuc`O8|9rDs)gP+EopIJvn)MK!hl;HX<#=j;U$i4PG)*`drKC1j6@78c%%!_4k zbCracIK_u0i-zXcNr-Nq{95Sav&+lRHe@ZyfGE^Re!jZiAZ_@#93it3})Y0?E*yw{VC zu(1THyd*Uk%%afQU&G7CXQ|BB6I4f}ax6`DR@R6eb(jKXY!~4gCO!=lH#h$Cl;`}z%!X)ih%N72ZvPWkeBaivM?B};t>m(tm;~}2z>q??%D|H#rULKM6+pZr9%;dZgdgpFDy!Tqb=wozaQduO4AFkL+&q}}h#OHXkb zQ(`3_SB*nEB_#fyG@K}V0wOw& z5QCu*(MihQB}^yMTE~vNCWq{s4{1%uE`4U}%ak+uZ@VUcw3uI%>u%h}kW4zfdf8ui z+p!eL(Dvt41!4DzKjJ4?Dn7CF5WUadCi* z=o@YlE9;bUCA!NeO@_BNnh3WfRykrZ|@OXhU#5^w)CLK zkQ)o1b+?V5)Ycs+$dHHko1H3~$B?bMYJ$B~Ydg2QbqHu6`dQzX2i<%) z%=v<{Fefr>$o@?{gEY?Yi{S3bF&VKKE6I!HR*gx1$8L1Hb8GSpyDCzM&uLMv>gG}~ z|9KI`e8%~m597256Ey;}wszJLY?*xBIa<>BYxF{zW_F6Sw{=A>x*OkkG(|l zFj%Q8!d4{bH>XyShy9m@#>lHiDKBqt6v#O9Bz5li;NSr4%aJUzyDO9%PA4w8&kbIc z*=cBKz;m#{lZlj-eDhzZ$>PR*B6~-JP{ZPtWs<&#X$B$QXZ$z4y$|=ptqfBk_` zCFvN1(FSwJap_}b8(I|ZKWod|bggssp|5ac2xY>~N1O@?)z@Z^*Y+Tdr^PQu+aW);S?i z|4bA`sHaOzbI&Aod#BDx!o+NEd#*={ou8O9A@<*OeXU3bQh7A84#lS zRbedmNi5|X0lqXNXT%jo?+WU7nMVw=TsY3(0S54c# zxv2Ix7hDYUQmC1^!#Zv{fQ)UEC=qXZx)9G6Q@p?sfu&2hJMEVF)_LA$?62vEg@pk$ z@9phvJ>Hr`EH8(GyKL)exL*?(NNlqGJ*d%ds{>ym9iHmxO8l#e;zjjHvj6%C{cN*8 zEnqt#Omd$`nE*smQ&XQE4$C6`F2@d~OD5~raLaspuX7g$nFcYj0a+E32!_;G%$W1qTOPPnOcJ;EL5H^Amh{1Ixh-f(_xz!k z7|^Ndq3vbIsNc4nkiX3?!5B)U^e|W+Vu=63T9TdR9VDYT|jaiJO*+kG=ln`VcR1Vr}S6g&Oy;+`q}w~jvM)Gs1kBT2v}h0%to4)RSt6!MK=5U z`{bIWEH0v;BFT*~^2)~(@)jQRCfg@Zdd#LH@4B_)wTZSxdVb7AiGh_M-&CqPOnYAa z+6Tu>Bm9x^!tf+vPThpxtL1$>{X4$v!DiEk zRagGGmd(vguRjHO<(|97%Tm6Vy?kZh53Q#wSd+M(ztmkAmc5T}cf_G1XY z);4TXEv(#Z=865e9sSeki%dXsfXA(28xhlElbK7-lAq{r-fa*jZnOmA#fSSZ6+LMZ+R! z?dicvNlAgn#)dIrQ%U<&IoB`u#4COtmCM!y_`L`&^lFt(+UM6>BW$?^gZF7^F}fu$ z5PgZ98zb3hJG1r6d(C`jOVPZ1z9)7?*ZL&ByIscKaREG-;B{(jM^#y@XG$Z=k(;TZItu8FaU=F*38 zzj_X+>Nnl2D)ESNhq)7LlG}-x(9OPlVZeD7Pml=32Uy&Bb%@tT!mcU-Lu@ePJtOD8 z-~O)OhvmNdM|j|qYswlnhn^1)p2e6boaCal*4WP^eE9fAr%3NP2DX~C&yn0uy+>yU z{k*Yb40(_l5hLU7NT$5)pF63mX%d##YE0td)MbqaIM8CEo^czY?3Jkq@BRCj&>{j6 zJlEj4jOd849?QiKxH-34c4@gfzy(5<&v^-EH}}1|^R&`#TEK6w4Qp?I9|ihV{G3!R znWwA5vVS0H>vwh0HyJDfI=N&XBUP@MjK4FrpLL3KN34bFy!Kfd8ykz09ypj#9c@hx zuLW>LHl4mKlTwkTgzB7^F~586#u3V#wQ|XcDUc}{f(;owZ8E=|9ufLLiXavOfuNG|D%YXzPvTaD!O#Khj$|uhaT(ST zsU>mAr;6CeG(7* zCq|T~k*WOnFKU0IKo-`I*xEo@6_4?j&%sX%V8GGg_uMgzI1PJHZ|LAE zo76e)`%N$7b7pillBP=eosATxEuFk&!cO>Mu`%`S?!5o0QKh$H1VL91V<29v^0Pt# z`qe+f9WJuRy9_mAkB}ZqL*bzMd#<1FzApIq%&=du)306AS&69=WNzQLkg02y=(~ zm4j|@V!EV%@BVQ9VB;9N*+QV&5?o z(;q)sr|Qh^QgG=9iMy_m88jEgaq8X&{a4A#3XV-!DllSEd69-3M-7F}za0XjF>AZJ&H!~1Pmj8w_jM`IfN z0C^f_?0#20;4yB5gU(HxXVmCL{3KOG*no$N3vYcWT~S?~U?@%8+~Xl$xirxahK_9X z65Z$~-_xa7(fQUa`B1vwltY?7eZQ@2tfOuax_kThWZX6C9R8gS>X?*PZs4lv1~(_B%;m zEr{n@ZqL?}0vLzAdUc-+2LmiVQxpqmN~nyCjJ*~UE#rU|M*zJ7$!Tko4P{8b7HN52 z`AQ@+Q_7npJ3G63(xrZO&DZ5k5mrHjH1(^AyNE(f1RW~|_7)Sf^&P;V!u{* z9KED!bs69j;Myo!WP=mY(b0;a@acK-gbc5}^>^|@u?SfJDqo)b6~ryet} zk$#hpur>!dk4bY(Ip1|P(aqU1p^)7ak*LFL>%nUO-~{2FJ8b~KN5863(n+}Wa#4}7 z2?>#bBe4kxlwZ7{dH4RkeKQ;2SNHl{(ylV$rxl(fFs>=hKbef+Qp)Sx*bH#%;ejFDpYAiqy`|&fTl+?d_VCub$9} zyP&5_dSYhneixwr-Z4UPAD9B3Kp#RD2Ksjj9WBtLHqB-BdXWXtUqW zWhRTCht4`2$*J`zt?~Q?HbXk8ecGs6hMWVr%eJtz+i&L06*9`SVnQ55lW`!yOX=s;a8( z#m_7E7TeIkh1=GAx)Kq)yYZm9KLgItJ2ccCf`RLF{70v=yE_L|!QSz)l9Lmk%+;Ra z@@)_3I_)3%%{5D22m=`hwsS$}U({9=M*la=is7vt9ccCS^&h2uJt8yxl?2i6Sh)_F z;hEd8+b6J>6oQwdreI<5Ma=dW`*K%qcibbV{@45;GaL@ZRH@QUPve|Uc-VE)-riL? zkRXP|qon6^9$S`?Dzh;?c<|$l9uZ>@oV*&9cv7nSoJ5{#bL2RJVJ`7!KoHTJpVhKS z3)3OxLtgaQ*PqYbnN&Y9($cGE$b>VfSxg6>@gN>d?ZmS#mg{+qU9?xiV!oKP;4vt%CPWw%2hE0S({7v}e)4okCW+wWuJQ>_({(HUi5AGqq46a3G`!CN7)|!Ro-5chA zPH%=xjQ+D6|NmG2e>FgDd>LS7;pZQvJ_f6iqpGYmf$A{-eKW=fY3Q(abWnqOyLU$s zS+tMZ|Jxq4WYB*Es(k*+@0#N~j*h~`;E_Pda0V#2!VfU5mCVi-8UG8hRY6mYH?(S0 z>6)WDOe`Fgot>~`BZ8o0>U@1XVuv`&Lr{^PUH`s}FAGO->$>Rosw+<42t_ibWQR~V zypZAKzi#^felKFIFyNJBud7MN1}aA239F0x-=_vhI-HUu@WI2?gO7lIKifHO85!-#i^1FVy6bP8*fVs^339KV09pZP6Po zbCf;u`AUhTYOeIMCbC>c-^qC0d{LIWED=F7+7)dVZ_1^|xxHpar3}Ypq;)R-o((Jv~L^I*O z#ex=Rhs2-@hR97v_s%tM-o>#n-lefH>AlRa()+OJ?@*8tR_S8bSsBM4dm>^TTMj~U zBqg7nHGK2t&En$M98wPSq&ha+ zhy-5M?dyMY!9e;#h<1#7G3u=uO}=(XHovFrv4;@?oGV_^kKf~oQg@VDau8b$&x@|6y z?xLmh&bByGwuUeP=7B~fV<)D5?a}8zi(I~|Wyaf9AOPPcri6`*jBt$cP=A;q=L`)E zMe-*hLc6$BQAZZmt^kc7n;wOb@I9QuPxz-*o&(gJ z^+Xl5g}^l&^0n7K{xgnzUG=W(OXGSb7@F?CSwmfLiPdEFqkx$107S;Nn&v&5hKJW& zU7Z*nqX=DdK(qB!7V{@8k)CdRT7EmPeJfV7+QIzZd{x(nie$lKEem1lYzkz-YLg61 zoO#emskXE?LY^y)E;d8~gqLLc7yHAj24;X8Y=l}en*RA!p!q;&#I{<$(Sko{X(qq< z`r>8h9x-4~B0&|^VLK1uF)?H+u{2>>Sxj`7n__@3vG0$dC&s@Sz4P$#Yh< z6Yhp95Hyb+BeYev9cx>Hl6;P^FY4uPtCdx29tC zRscq{VT?3jOWIsWx+np-o2&ej-Z|uDwIYF$1)zH++)E7LEd1Vo_yNZQc_M)S!9cR) zSoSCB*E*!nc>`1B+b64w zhz_J<2AsJ?U}oqZJAVas-{Rle1&>V;K!xt+#r(rMpJ_;2`psp@quE_plY%yq06gfk z4LA@X*+7*JNo8rW^Z5?h0f%>Db%y6j>hsYwk@AC? z^o18s8V=SIpC${MU7?4=pAsn%0}D*S)HG|*8|YHu*D>_mhf7`2pn$)=81C=K&0$A{ zfE0{%UhbABQzE0FczJ%XdUm;R8wXYx0iq=pu;<>Ur^g0dUzi=N{CKs>WztLsB%w&^ zM4=An;}ii55GaW(48w`&B@p>YZDSg;_;L$s{ATUwY0|zFKo{vA6QiR5|FZ{} z#WB98JIJIGyxww-7L809{boP$8oTMIh5icK<5U4uzdso#78_U7fP3ybZD@&jTF@DW zOUdW9q50*@7rFc9Y|X)H!$a0c*H?A|+2Mv_JY!6jTo+QKf%Z$~ZgJ^Sg<1zZtyly( zNz0l}Xe2zg;b7HS?%qXzRQLp7Y>re}`Vr*71X(i{iEOvolk$J_Po@U{$=fN@@qzdb+yIwkArjf!YNo5Hhj7 z0*2>D5qlb>WejNZ%G%n?@j@M4OExw(^XUr9S7VJ$O@B|KAUV+O_h(&)&47sl%BTk% z9&>0MaBfK_9+((H=kYM{wmTV1ZCxw+b;+j3l8MZ+rAR0 z-tBpNNx;m^tbc+KNRx2Kx&3s&3*zByU^VDBzZCyDHl}7r%8AA-An=q<*p}?yu?v;t z{p?@2iu$=f&vDn52SpczB-4n2kxtI32V4ehN*+TwfM(m%4Lz@(Z;FmNZ;UYeRW8$V zc?F^%pRD*rH4eR`TPHAziOA{0fJyXnzR~-ky1Mcy<#$PK56ky_5^X!=oEY*!>`|b0 zWpB>z`kd~>&eS@l4x$B-vZ-f*#JA3UD`{NH*Ah5_F5#OXwc<%mJ+|mwb+Hzrp%Zh0 zkS+EVJYVZGCirRWVbu$6Ft#yxK~`J( zphOp!kdP3ZDdG=IJ8=V+KKM*3ddowDDn01SmwU^eVVpb~e`k6pEt8uZwkN6d%8bH* z$!-94%#A4WRzbns6%-`RX3p-uUR>XbU_7}Ey8q-86W}3WLH4g)hs{sYrZ;{Skdly+ zYSlUz4P=TgI5g-mL-+_xzDj}zBY$pvmdpYnOX0TAN&Tjz_>+vyniN2w)Rd4 z7^L7IKT-ilbC_eW-$J0_nBV9Wc%gCtZtao+cju*n@iT(BAd)61d`b95{FMr*s3cm)2QYU4UT&#j{YyGgGw*>w;B_M#}U2Y32EAzGx4Bf5n&Q2zf&H)|G=|Ky&iCEx`6yz_KBK(?y zLCPx#pH@W7kWntM&I-JR-hqM6i{mYOhb@2^z~zhS*v*7<)J`sV(Id^`!to;DIynKN z<#)cCOeN{S_1$AL>aI$B7QoaC`2||hl#je&q4*??2(Fx#BnPHU)VEYdE%Ikkg7Z zm{%ME;N#!Q{^;dPmhKqpXG<e7kEZ19uCf_h1k(++lg;$a3)fB45?$2>iJN?H4dx^}+=A8`1Q)tKjlWL#cw}vACMPF{@hgg>y*&)K z-%=9vP7dc3aDinIw(>^&CaPzfe;mE-TtsA+(ySauXLEAVb5}OW${h}8@NG;NCGROw z05q$fQl&?AbU8A4&c*zslo*hn6#^s^Gjt~=2dvD>6gVC^sz00%_Y1|4o{{#0#FL7_ z6~BM@(f^fv{hOCbb-f3Kg>^x>ncOH$l~Y7y;z3@o!2c@&Yny@V`6Hd4oR^z0qk_rJ z$=Xa@TZNr)q#vXD;q6;3Ac{ph|2L7X^~k3B#p85|>OO~fz$Z;o6yLB%O;tIQW(4kd zA9;Pl0!df7*)=9SM}O%%z_72Mj441Y>S}Yo`WNsmcwAg*#mrrn)0OottJAUygZh`O zSE*;q0LeU(o!uLBrhgX-M8KcWiXwpgySrI*Z~J0_$M5=ha;nKnRK#vdbLqR@P2h z>p|nMW!9tEztL@u1j@R)NzMUJpOPr!F$RZ(pjO&noL?a3Jm-}%=l%EWCavCn`h)}N zH+XO(AtJ#464AB8`|{@M96H)0fnGIBj_G#;Qj;@tILGHPpub!NbWFugoJ;n&ZT8qE zX#anC1ph~%WoSsJTWT1I473J62~!DJz^5g6Tdo8EjVzuJoSO%_Z+|l{6BQD1oR0y7 zXl6D^K2yfuX|WXr5Q{Eh$xwJ-x}|CUHp)L#5kD|65YUmI+bn?v1qI0U-ZgFlJns!j zUaE_Z!K!*69gD+k9g+}N+Hk+9Y6bBr-HY45k&fmUF`H8vb@aDhtBhwLr9jzeaC=Ac zzTEbh1N5Jw;|$*&@q7M>Zwkh8mojg!*q}vF97t{7JbT01JavL0V|c<0nYy)G18VnN zFm{X3%OARFSZ^X40{$M*)rr}X@m`{ z*x>m&R3VBw*hEnIb^l*4|JE&QhABE|55$cSbiYaZ&RCvCkDf_jm~oR2b#krf+&j+S z9G*|twtyLQjsT&E^>`sUgiQWH#BWV8GGP1MVENwAe|jKM=i}G51EbJbeK=DCghtUm!*S2#!~211$VHm(@{3HlQiR z#!WO}%pT02E9>inu}{UfA3nTUTr>qqFSEG#bTJs|dga;#+#{-5HZTMTC{pA3S}I_N zQFHdID=W|<`4+seqL73M%%wEnT)ZweX_*(}e!zd{{jE4PQcze}+=KjS%}pJ@e=VHX zO%#U##K+rhJR|@cHHb#ocCqBGBjO}|hDvgxaZ3pdzJl;kcMA&>a|wjk)(g$jGM7h! zUOwKaP!g9>NGz?$OVD*c3R=aD`}D*yC|YRWBVd$?q2PW2K}#x~%e|v_k%P~`)(!&z zFYFiCt%&R6rkd`CUJ)ffuv$VDU5sDyZ1M#Q@(7|U8dItx)KvrGSS8E7j z-T4k62nK3Sf4?q6Zj6n&hT1uMpphw%q3(MPnMm%;4Z?;DNnZlRaJ;rJKi(sG6A1f1 zgE<4SgJt4niIZG|!aw#pDTAb54bZ1n3V+N5lM))^_|KMVr@u6d4z661J zx21h#RE*1|A`KYI1J9H(T{SFoIdC>hR0l}s8xRCNF9`%BJav`ECvv;QDr;=h35eH5 z;H-i0lEZ_3EQ3vDXaabV*nngA6kVGLHxu}?kO3@1W|*f7fs6n*yDMJwkE}Vy6O8{( zb@)MUpD0NTgj5&s1(^Zq?+K8I`({qkH><=N#Zr3XO^z~%miF|K8t4H!xwIu>cRrKO z?(k#)q289G6kQ&88vy12DsqYxVXJa%e^mXaw~*F|s;ah#e%U3;zcM3tg~LDIIl_#X|GJ=rCNACPUX535H|%h_uePjt;;nHlKN$KTl6 zW9tutm_dU^W)OuR9`kBGEL{auf6WcdUR^kdGVO%d7#1O&XCoU8t$Q}W0--@OXg{lE z7Nve&1O+Ag;A5Z@+os@|*j?8ta3GD8oh~6cNUk=ZW3gbIu*Rs`;!}X>*Ze}l^a>e^ zaax_n+{j3!9A;Kt`SZ2^x%Q z7)@B<=q2{WE%>xhl-!ID7N6D0z=1aIgf<=qW!?YNPI#J;v z*o2m&@-dA$m4c1hE^yR@%#?`emf2q|;gI|YB?k_lox*L7_4{0dzQKOixd!AC=N%kq zl1YI_zNol!tjK@~im8z6 z$i5}`QGBrTyONWIMm+GzEu5U3oGhG&Bg3S}YLVSpnjg3xH{3nKRp6U8mGNZ(?}`Io zBe9WPlIlAhbm)Lh#fF`;m!ByQ9o!lQgAbFjL)c343P%Jquel6`u2dEpvSp)!RhT=s z?-AlBBxS6<6Gc|uP@cAwg#1{Ay=cv4INjdHg9=`MI5_%x2Ycj{~2YgB~fV!%7uQL;e@uePDM0 diff --git a/doc/salome/gui/GEOM/pics/extrusion.png b/doc/salome/gui/GEOM/pics/extrusion.png index 2d7017e935c381a66e281ef15ff5fb4c71cff478..7934b4d49c7749b97343cabb8361d94ec633c192 100755 GIT binary patch delta 18 acmcbZaXy2kGr-S%BkLxn%{!Q88Ug@J)CYtB delta 21 dcmX?~aWR9nGr-TCcO%OtCPv=P+n8n=0sve+2b}-_ diff --git a/doc/salome/gui/GEOM/pics/facesn1.png b/doc/salome/gui/GEOM/pics/facesn1.png index c78703a1107594d007746d04cb8f069ba11af690..51a563422e497b9bd1b3e0eccf004ce0a4ad3a77 100755 GIT binary patch delta 13 UcmX>maa4k(Gr-S%Bda4103p@{F#rGn delta 14 VcmX>qaZG}>Gr-TCcO#1<4*(@f1U>)& diff --git a/doc/salome/gui/GEOM/pics/facesn2.png b/doc/salome/gui/GEOM/pics/facesn2.png index 59403a08cf008ca324793ac411c430c3048a29ad..6c901e586f4bdebe342c50669cc946d9f50dc8c4 100755 GIT binary patch delta 13 UcmbOtK3SZlGr-S%BWpi503E9Y7ytkO delta 14 VcmbO%K1H0hGr-TCcOy$bHvk~H1SJ3f diff --git a/doc/salome/gui/GEOM/pics/facesn3.png b/doc/salome/gui/GEOM/pics/facesn3.png index 7c95d11562a20e7105ee5866d7174e04d982edb5..decc163731a29bbef8ebd1f201982f491f8d9a73 100755 GIT binary patch delta 13 UcmeAc>=I<@4DfT`$lAsM03134?f?J) delta 14 VcmeAY>=tD04DfU3-N@3$0RSH=1N#5~ diff --git a/doc/salome/gui/GEOM/pics/fillet1.png b/doc/salome/gui/GEOM/pics/fillet1.png index 7fd3db53f71f6be1e357bb2efbb76b23569a0897..d3ca3f10559b07b676730b7fdbc6a10a8ff0a41b 100755 GIT binary patch delta 13 Ucmdm&v^R;RGr-S%Bdet$04Ik8(f|Me delta 14 Vcmdm+v@eOZGr-TCcO#3XApk3X1m6Gv diff --git a/doc/salome/gui/GEOM/pics/fillet2.png b/doc/salome/gui/GEOM/pics/fillet2.png index d42e333ea9644111482f3cc4d1374008755d970b..3851917bbd4f6c8f1a16b981b0ea913b302a7f25 100755 GIT binary patch delta 13 Ucmdm=yDyieGr-S%BkL|R04bOSZ~y=R delta 14 Vcmdm&yFZt;Gr-TCcO%O#GXO291$_Vj diff --git a/doc/salome/gui/GEOM/pics/fillet3.png b/doc/salome/gui/GEOM/pics/fillet3.png index 73e453339fe5d8b1c920bcbf1473519e1015b437..8704cabfbcd7ba3ff4b444dcb59bd1c968031102 100755 GIT binary patch delta 18 ZcmX?^b3BKoGr-S%BddkUW;+vZCICl$1}^{r delta 21 ccmX?}b25juGr-TCcO#312_x@j8xw9O09HN*NB{r; diff --git a/doc/salome/gui/GEOM/pics/fillet_all.png b/doc/salome/gui/GEOM/pics/fillet_all.png index c1650b907f48c57a31f57c3379e68d83d4693fab..f5db8b83dabac4fd37150d2bd894ae0f3f8137ff 100755 GIT binary patch delta 13 Ucmey7^gW5CGr-S%BWtlC04-|;fB*mh delta 14 VcmeyK^dpJ2Gr-TCcOy%&ApkMg1&sgz diff --git a/doc/salome/gui/GEOM/pics/fillet_edge.png b/doc/salome/gui/GEOM/pics/fillet_edge.png index 9572abb79b44686a5766f55cbc6415104a3001ca..5c8a2888307df6db3031dce5e8e58d60b54a9d12 100755 GIT binary patch delta 13 UcmcZ{d?}cvGr-S%BkMU$04Y}mYXATM delta 14 VcmcZGr-TCcO%PvYXCB-1_b~B diff --git a/doc/salome/gui/GEOM/pics/filling_compoundsn.png b/doc/salome/gui/GEOM/pics/filling_compoundsn.png index 9d3846b2b3837d8c700726b63290259f38d7e71a..3a09a4135b1dc6cc333a4197a3926eac46449e47 100755 GIT binary patch delta 13 UcmX>td`g(5Gr-S%BkM6v03zoEvj6}9 delta 14 VcmX>ld|H^bGr-TCcO%O&P5>rb1i%0Q diff --git a/doc/salome/gui/GEOM/pics/fillingsn.png b/doc/salome/gui/GEOM/pics/fillingsn.png index 2446e89d514b049117bdfa37efd9f13e2e3088d2..d898074afbecfadc71d2a715d1c762db2ed75e31 100755 GIT binary patch delta 18 acmdnxxxpF delta 14 VcmaEp@-~IFGr-TCcOy%N5dbjM1#tiX diff --git a/doc/salome/gui/GEOM/pics/free_boudaries2.png b/doc/salome/gui/GEOM/pics/free_boudaries2.png index 1523fe91126d7f52a328bf8f4eb8a85f50eaf008..35b011836e4d0964fadbf793b05ba8fd4c9b3147 100755 GIT binary patch delta 13 UcmbP~HZhH*Gr-S%BP*{l03&GxSO5S3 delta 14 VcmbQ3HYts@Gr-TCcOwh0F#snK1Z4mK diff --git a/doc/salome/gui/GEOM/pics/free_faces1.png b/doc/salome/gui/GEOM/pics/free_faces1.png index 530d8440bc19a8f5fa4a8673d8591750fee489f5..b59547f24004d7e3dda8e2c8d96c58844985f041 100755 GIT binary patch delta 15 WcmZph$=EuRk)<=h&wV3nqYnTpAq6!6 delta 16 XcmZpj$=EiNk+n0x&z*N8OQR0}FBk2C2R;A* delta 21 ccmcayeYKjkGr-TCcO%PsW=7u4o0%1?0A8vGR{#J2 diff --git a/doc/salome/gui/GEOM/pics/geomimport.png b/doc/salome/gui/GEOM/pics/geomimport.png index 516a819bd1b416f1a551d421384390d76ae2bc36..4b2b8ae295e84f1c21a1af59022323f6a9b3c3a2 100755 GIT binary patch delta 13 UcmZ2ov8sZlGr-S%BdeMX04In9&;S4c delta 14 VcmZ2gvATk_Gr-TCcO#3M4FD^K1l<4t diff --git a/doc/salome/gui/GEOM/pics/glue_faces1.png b/doc/salome/gui/GEOM/pics/glue_faces1.png index 787c9b0d6b2784bffa88f2f0d0cd644cbe9712ba..10ce527ba9ab1ba8135ecabfdc6a5dd868bdab54 100755 GIT binary patch delta 23 fcmez5^WKN0Gr-S%BWn`d<_xxM(al$+=Wzi5bDs$H delta 28 icmaFw^T~&`Gr-TCcOy#@8zb-LG`4I}AazlC9v1+R*9jQ_ diff --git a/doc/salome/gui/GEOM/pics/glue_faces2.png b/doc/salome/gui/GEOM/pics/glue_faces2.png index d3366136770f9026b7b583fd4f55b966dde60dc4..99c5d40f78c8beb2870170eaf86b55984aab1acf 100755 GIT binary patch delta 13 UcmdnxyVIAYGr-S%BkNW*047ES5dZ)H delta 14 Vcmdn#yUUlgGr-TCcO%PIH2^9M1s(tZ diff --git a/doc/salome/gui/GEOM/pics/import.png b/doc/salome/gui/GEOM/pics/import.png deleted file mode 100755 index 8039e55a36902dda3d7c63d25633693add4508a7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15937 zcmch;by$>L*Ec+%Vo)Lqh=huOGzbEcDu~jGC^fVQhzup2iqe9Lbg7g`H$!)bgmiZZ zLw5}Dt@FCB`~IFfp7;IhJr098Ib-jA?zPr0*7!bDx=(tB_6!PzB9(n0t%5=ka-mQJ z=S~s95k9WzFcj)CN>=)gs`|UdVMmwqo8w2Ty;Edo$wHX!d|*QRsRzha9{=#rU(@}~ zZE?SF6pQXP59usbv9q|>SA9Hg3n%zI;gHRLio1Z}xSq0l`}NhZ*OsT>>Mbqc57q6O zSfczFSW3nZT*Uq?wf>srkL&OHB^tN;%b287Alo-EP~zy0w6t_Wta*P9F3;X?&Ahj@d4>xah`dLpY;%&M04e+B z%HDxHj~=Suexy&q%*?#Avvc0r2`&2*!zk$Jq%VyU`uQo6#jPdQsyGgZy*odNo0PwE=SqKna(4LhbX>tSg_gwW zmFZd}#*GreEz@DTN+ouSr_Y?JZfNkH_++rQzSdV_ z&v=sjP$5+?-E>6Y?Uq*)kFme7-H#u|$IzNW54nSAy!7cwZ3GMd47pm$?52Bg;Dt~u zhi*iQZ(L32rsSjQS?6BOW$p+al9u_G&+PnWa>*VHV$6wrw6>1RD;a-o7Zv}94$o8G zRF+&YS^`Ve_0az;qlg#LIl3u$Be$kzrmZ%+%l@=~J$86_7@p*78mULKgEnZ-G2-AZ z+fXUrUlM&oNNCa{@RlsyPuMNzLo`}G(RMakT+4J=;!rVFyYNX0+JOGD4R>B&Ltc2e z*Xu_!GKbY;=PGOSXwK6eos8jW`)a?xC1BA>UeR;V)O-{&>HT=uX!&{I@~ziFLF5fL z_)U7!_%vkH+*-I2l6p!VIO3CB)hDfQb{`ct_veXsF78uMP^6ft*_lYEQdNCc_iK`f zQG}H=87&tt^Dfgi#rDQ7)VD=Q+B7kTwHG9kM>P1|vaYrwE6lOA|I_~3ZgD_Al11FT z!Ygy+;!@T@`s$Iv;OPAoTxNy!%B*Le$?tE~#RSd_eDbylI|TShW6}#mL`nJv;ep~@ zqf?vt729m{mA#S-dh3N2?dv}?v8A3(tGYS6cz=tX@nn9QMb@#-9qXYbVZ>oFDqf%d_iW6yh$zmVujOG?K70PWbd;d^ zbxuy}zWTN{?+Js3*ubahnja$~nj#kX^NRAA7d5r|)>W=09yFdWNZS=h zJ&Hd(aa%`+flI648b5zJ{m6)(iv}K+_GKYV!HWRbm}j1Pi83}mvqbZ zZ55S#z8t|2jS-;oB@DlbI#_iYytp=)VBm0-m_{p8x*fy%Vba7$CqRet@ z&Tl-yWlhp+bm)Y~qe9!Unq{8S_YnB8*VBv)2|WqfxVf)fzfQx*$hfw)cIwQ^bPY3~ zI%iLo0Sysz=(#oP^&-PH>Sz($GyZjV^&b%^O40r<2zi(5c<)J1OjHzcxJxu$O$&KK ze~q7hrKC>a)NGu4QdU;h&th{Uh1{-~mcG04I(&MXJQpK~Xu3<>ug8^3>#Us^bep>^ z``TG)Z+CY7VBNEVDa+_uNx751nFXEFRs`B@Z)p_8>839x`D~B!g4KzjBgb>`3?tPY z$tTO4}y2nETS(0sHH{b6wjK~GcixOo0**(spOvbX_K>k2Z?wk3x)*OvhoK_%Y z`UDB|z&8qlLxSVSkE?s$)xQGSZHhY7a_c3xn;Q|8|GPJD?!x4S?QZny^t6pKy1V1j ze}-urWXA=?bZe`q7-SC4==y&v+N^3pl^(uQcDuDo?4>`pysT?9>>(bcE~-L8()unG z|Ax54#l|LVd2U$Ho4l~RO`}4GTJ`>uwY7BJ%GbwE7VZ6HL%AHpsb-W<8|@2T62c@% zP1WGh9sUf%CE3n6Ymv9&^@GiftQ$X^Z_Nw_GYl8!;QSNOw{|p~BUZl8ZHWw^Z8KeU zk*s~^kuUk3J9m!n?Ay$|By-%|Rc}4vZ&)$ao|nBD`V7a+6wLCTkf5(Svs)0ug> zOiX&8{q-n3zjt3$gran2Af5U7){ybAwa&Jl>4H5@D&j-M5|QB`AD;(OmVeX<)X;8h z5)u;Usi-uarC(=Yz5RvI=C-y5C@@dc2OmB(8TT&hC!1~anp zDs71)qlmCmKsH9L{Lp@8qt1YBd?$M{@5OK=MEV(Ah7ZMs3q}lQ{L)vc$Jqq&w%641 z%w-y?nsFs;uvr=EAd`A8FSi_XFYbf~WF~QyX!XjF<7?%tdS&t@F?Kbbe6U7z4ddeZ2HsLF~=skCj3Z7n_ ze!nP;Ny8Iu?!?C>GXlh?$99^;?3N|#pvW2y_juwhj!Zd|G~R2hwdHox)Bg_D8P@E; zx=!2ne!dHn_i=bvu$#J)vMd8X`>1;Vee6U<4)K<&V1~rN6?p#>Ul!6owX~XWuBXk- zv%SG^PM19;pie368Xcd@j%8T)lS@YHz6We=J-qQ5RDhzKz4Y~7%#&JugCQx+TfFg2 zaYGJY@Hb6al~mqM9SMH>&a2y=QcNnsW#Xh>Rc&5hM}R~8)YO!9^TgyN?kn?E>ugb{ z4HH+PD(2`D-ZdKDxM!ob`HaeHf^h(zoL18JUIurmSX<|GdZ_%irugW!G-y$t*n6{# zyU0b|geD1_H)LINDmC~v1(l}Ieu{6-l_kp_eQ%>yiQcFE@XQaq&xOaw$6xNRaR??R z_BgSs*tedf^xW83l$J&tyT1<-irK34aMG7f7~k89vM_rxVmEO!;H_M*=;J6#+qo|) z#j(VvdA+O-?JG<}k6d-Tos6UNzb@QRJDJ{9n7)YTG^Zz~F12>Mj4>~|O7S$AOj#i| z_S;Ln>~axu)~2Q=+6|Vgq#cE$F7ggxmRooW<@9;0o@SL0zq^6_txjAo#V@q#@Vqsx zAFT0x^aAg_Xz%_6M?biKcp`t?vS*Q6HRCGxX)ar%(L>kG;p0J1B(hZTXIhU8Ioa68 zR~r~-`;Ft$t=(^uieKo~ej=K==u zyJa(Dx!xkwyCXc5^3Bl3Nbl8jw$smT7Ej zmA&spDUj5B=Pg2CZx}gmT;b2Is~eeG)9}t(%cQBXaV+~{5TH+KH#dnkv3-(Ww2k7s zW^UtFa2^il0f}_^!w#VPQSMI zl-0{Hx3o<8*RMJ{Io#j-d@m|jj1v4^;ePaDQIv-#Q^q`9b~sTnMkM5S{C$4A1@)(C z>UUIB&YAUQ7>$%V4!NwiD8!0IESK*GUXk*$1P-FPn3~bGQIZ zXX%B}G5NV|qwYNF`X0{-zcK5>4$A1b=e3sV#*d>=kGq-U=5@}or%Tl5eV#68|0KZd zn|!n;AT;8@q$Ox^g^kTOFE8&**s;=st-;cxwrxlAZnK^JeKpOa^uiH27Z)+@>XJUG z=DPFhFMo&%)=^n@bQT_)Q!12|m!E86jXR!JM&N$99=E$Q88kPL&jAqV*|TSs-A~lA zpSRFL-F4iZ4s(PzWI9yDck9-z0J>YB?syWdj(L)IKvs+tFs%lrp|n2JvS@2DTpaTD z?QwX~G7d$PJQr$s!*7~V!3uDTJ8w;8x*u?unwoOzl+t*JE){v+XK+03L2!%+c@{x? zp6O%A>l|WagSux6w%2FdczTz#FxYoZ!K{XnEcfo+<5bV`7{$*BZCO7~QqZq@a{`i) z@MoYFn)&5N9WYQn#m>3ar(H7_IG$$N%qrp`x-Nacc%5&%X@=Pf$$~LL^ja#3=0+z1U zU)tK_fBs9a`^S@n#Kdg<8X}S!y`dtj(v@oBG~J5WlBHsQ^TC2!UE-J_;pc6!El_`p z_LoYU^Cw$Hm!E+ikfu{c>(QC4jF3fC`?q_RZg^0Tj z4#LNXNGyeW0NVAt3#L9zpE%rKws(rYuvjQE8rAr&xSi6%cC$E1ExjR2wN@Z(KuT_I zJO8nxUiN0GYS-f@+KDwj`ZQba-P*cO)lI@{Dsq~mUF~ibZsxu9_FnH+)BT;PD_LMZ zC=~0~d-4$1;c{2eUTu4N z`LNKVAPlUc^!@vyoFx-}9MR>4yRb_gR_mynT3dm82El9*#=p0TJ6ZYtQ9P zDMr-(93|zkN+1-?-Hy{CY9jcTQ9>351)uA znPsUCE^YYY#fy;NYRcbdW@bw5!d@2UQqwXDD*PsR$*U^hBLAPkLZ179bOdxkwqupA zuQ4-!{P^)syv%z@22zQOTqUD^W;3JZikp==zLY z%x1PV@k#2_Em6QffkQ*+twm8upFxch=Z!yiUc6w}E`D`|pTEX1_e56gD`&vbi~ZupKk1 zIi2R8y|M4lmleHi?wk2kPowx1+v(HOM>QO5Y-~a+SoXz%{CL2h0v03D(b04eQHskW zWf8(wS6d=)##>F+r)lQ<(Tm#k;dJ22)zww8^?1a}9{m z8ZXk+N6zwca@>Drc_w^cR@HT*ZD-rD1K&+8Q&PM{lIs4FMuQkF;?S6mTIrx@;=0fg zv21hOD^_<6-YKu7nGj-sUb}Y9BsP?&)*$;sbhLtu43T^&XUg(S|NQ<N?t|KbRyWbPQeQt9sJ4<^~Hbu+zx- z@D6MTLc?_3A^;0y>DPFP3}-&jV7ecWw#iHk*ox=ln)upf zrm}sNiAj9MSy@i*DjQo$dDInZtk+sYu&8pW?dHiM(fT|G!gm1vtWGPRUhS}C%X9Gc zt4GvSkIjx(QpxQT%xFGdMIf6=IiAliu@|=ZZ~$1Hko!x*ow#sb6Us|1$Mrk}w5omI zyggKV+Bd_*8$Jo>!RE;?PpM_LC!e!J1Kza~(q=dZ|7U(_M*y!*6<2WcE$4Ylmr{F) z+1qdF>zCJ#eB_yiGyEQ(*=@cp4VOx29g!0n0wh74=_73kBFA!00R>LzM zJVCoTUcY*kkk{Ae%TTIq3}Dn}BsJ}wcMz(ff}!;>`w$zeldcAL`8aPWZ^Gtm`aS30 zpHeV-*@3oyJtETS@0om0M$midn}0q!yi}IoUK)-mr-mE&2RF}}W-DDTJpX`Iyi6ps zbrBN4oHJaH6~+qW)iyL3(nLBV*Q48}#knH;pTdtrRf_x*elXUe(0?cjvfLD_XZ~41 zw8UBJmxbb@enCO@4H0j_R5#{2y<^3lZ&*!8pE+~pMUUT^=d;@RFP^-gM;2&r z_P4U*NU<%)V1YRk6O(6Yso3+@=($f@b#-;v1O_-IMU-Lx^K1tmj}PZFBr@ws8{c29 z0NKL}pbiB+y&^;i3NQ)ljT@iB!)Y)@<3u_xtM{CD0fl)|Fv&c8_^=YH6amO&6RDZy zSK+iMOtEicxh{m2KECux&qRUYKn)DHH2{=m@|Ay|V~!s_~s=vl!RSIa66>UCne6 zetv$_&Lq-*6|te-UTP0=i5(AWU6+pw3ol_YeBQr5p$DjfPT0}|k9WZz9MI3>0q6Vr z`4L_g5s74U+o>wYRC*AgNEpPzq4wyk*dzQjWBh_R7f6Cgy2P&rxhDYKUl=L7)G4sL zI~%8wZEymWl9B>QFg)L^cWoiJ?S?_^Db&*pv@GD&An`4AtW$~oaw`a*WR;;@T6ERz z0CZ656>j3g#kQ&4+sHHWXMc-x!K)8XYUF#;GtQ>`zhY1el| zYUQro+5x?~>QSj-D?$jqG@@sOPm8;8#{$|2fG1NmE5eP!|g&pu(0Is=@iz zA1xh~<*lu6z$LW}tiq)_f9R0NxjHrxOQoe}bto|VzlU1OZ6q5$vF^N$25!3XqD*A{ z_kBi+ix*{|J-gj`jNpW$;q#9I$WCN;r6_|uj0IDg=CXlOmX z{SZMV{8I%mw%I(_Zc!5kiD+vOF)YHuMMHv2_XDQ}Eh^G`Bp_wevIi}grpV37^8s;S z1{(!dw&SbRN$)nX4is9n0bHX0xj0f51*&7%U~-*-esd_7LZraytgWTKo_>WGk!}g1B$zL(|FJ-V zq`Zj<1IRtdwwer*WP#$IqziSo@m>|z*Tm=ITp4^oev*{qly`l)CI%KmQe86?cR;&cM#lMhcqyRa8h?R2&qz2FUlza~8A}SawvnyAu);Hnz2~ z3JMmWO|lo);cfnk5vBHk%*F4pqE|`#^rzEYVi@FGBS4;@-RD5&-!F!x%LOVM%BfKe z!06QJ(_g=T_vzJjFB=ks@FbK`RsDR+4ewB0Q`5gSt)>te-Z-9CW9rWG2Zf@?BfS9K z8JDf@0zP8%SfATZWx8_Z&N_l<1S~b~=lm!$2gQn2DH=7Fn`g_3Uhy+?)&vzShRhC0 zH7Q(Sx(q5o09kyBJpZrKkJ>DOCz50?SpDzGC*bSrEt$Cty(@Vzr>qbs5regv9SCE-c8%Ato&?c14iEOR zfc8(HK20!IFo-b(b;o6;>Lg(36^NFi$t3rZ3}mfL|7gzn5I5eU=TTm+E;6>}VWeey?s1yr50 z^zFL^U{CR|YfS0y2 z6|C&A)o;wf2@IAd)_LhxPo{1gf16lMU$!Cr7C&StM1MjKYTFOjfu@0k_U~`^(zFT# zndL)4hnfw{L=1-)ja=(_U4JJP?3(?EBP*ip!B$4RB*2mbWbJi1CCJ%~GPT)ufTgj>7#1IS*QnvtUAi1wdy1?mk!5!5vr zK7->t75JQ*wUdl4AI59EZ2%Qe($dO-y5j(lAY8yy1$%=-E#uilt*^j~E+2s90Kn!R z_O4Ag{|63Udbo#sh3k1=R3r?#R8vcf5xj(@9Y0vS1g`*C2pjy)DhNoqi_Mwg0(>7q zv`^K(GXV@%MFln6xvh5p?%g*trZ6_sF`%YgY}M4EkCZSV|?4*QKBiH(qs z=__#8f0L>IMn{2me)Qr7yQe&={W4vv2s(9b9+_eaQK!J>GU3s%<7^D~?#1uPb)L*h z4}eL7uM`8ov{13(tEt3%*j<0`&M8-T($iuwBoFG``C3OzherC zN1+bGeBamjgM-!>(cPLxNnY#P2VNt5pFx-r=AwirgO0m1+)`ndDcF5&Rd5&Y)_?2p2R3I?qscJ6W@@SA` zD9)WDyxp0k=s2H}tPXORp7^r(Zf)?;tpz2bVF90wjaOgR*3)urQiZHFl;!8VWyK}; z9c6+T7PAh&Hj!sr{=SP;<9st}xc}}(u5wI|EiSzfK)!O=3OC{~Gz2js5((P2`w0M^ z&Uj~X2u954At;lEYg0{c?a5}FGs_e1`BS|*y<82@k9}x%hAT?j_7A)!ZW{olBDV8W zS)5{G(Q)L5FOS3kKg33Eo{w|gx)>z3b_yi+C$YxOv07yxoA1g$F??#b(0AwP&*4^E zd3pH-%pgRvH_q;0Z_{w@Q{vmVZ}oOQSH#*wXo|Y(2D<{GcX$KoDhEI_e#=Cu(?k6?4m@n66IT zL}E0r95RSP=PSoD>H#VXQDs&*>*mdTnME>U(n;WtD3{QJz<0ztDJ8L?^Vh}03k59p z$B{(*-LLhXAic<|?@?Y3mxIo5oq@(h>+DW!mO*6wDDj_;4{*|5|NAh$6eMDO97uv7 zJOjn_E0Hpo{8s>`ctI-dwWs8E`YTAgKSV}qjw%-YVMBnO>K*$H2O`qHxZ=OmsQ)=7 z6+1)qNua$u__oKMvb1MqyhfwQL_Zz($YfOywk{6gojR<{%ys7cer8E)dx`B6;~RJ+ zDRI1qMDvlTiZ=kf+oA|WP^yhrSCD_-96-m{LCQs;9FIT=hS@*A&FLHmnP0wqL1TeYtpb%)E4CP{070-nEX*zaeL})D zGJ26`N72wZCeKq=3kJ(A*S%NRt)fm)9vpVYy@!j*A^k+k*XM!FYqgl)J0MvINIoPp z{Tio00Mv!W%wF)s%0K&A80uRB36b`IyNVnt4*d3?s zr54xiVYNBC#OdkjZv5rwz5?@0AP(f25B8KVG=5|PmEaTUCBdv`P3J&lSo-Ap6JuNeKxF zGSh##Uz8reWn=%FU-m0bGEQjJB^Z_~I5@ZlMjRn%9w{YGOvO2d*f;912to)R0M-`G z&<04S66he1zVo07kAvX>4k0gKXFwWmU%r3;j&>%g8ADiB#nA!u_r*Tz&oPpgkqJ#b zLM$lo<-md}mKpW+=?YvV*EMdw^ri+&ww%yWD6J?O3zND$x`T{?aA;|`LG>cAoL@2jj+gA{@A9Y1U1bv`LNCQgP zOld7LTsYh?*O}~S)#?wGR8`adm8w8g;Y+(&{hp|fuzMrm#GdI**T_w(w*8v}=MEJE zn92dH^J38%%ncUb&QBi4?@QyKkV56Q|Hc~QO4h(hRjslhy&UgDye+L4`5dSGZcP;nA&n@ zWt_dOYNYZXQ$QK$>|i4Darf!?v^A-^LFO58lmEWloz0P?!)T1+VBF>$SBx z<2aFY9P}>~yzH;uKXQrd=lL}Q@iPkmJF$(_)nR|J(07Tk#W>Ej-lk3bzNRLvl$%h3 zrmb@nsO1-0eavWxl1vRES&nww+-V>SgZ^Tpelp8--_Gr5f7AxBr!|iKM=tvXb7L(G z4G|P5GVz=6FDN{@AYMMr)KLT%&dtpYoR%A)?sz-7xVo~jv;WxArG{1_b#)&g+b2$( z5HRg{`|aD+{o+rb&H>YoE=bPFNeub?`79011K@!91J|xnw;E_hkF25ljRIh72}wx< z?m}3@;)8aLH( z!E#@==i%>z#W+`2SB~Lw@SlD~-wFmabC!-y0XlzCJ_}}x#ml1=l7{8_UdBJYnT+yboIsI}*CgYYR}uLL?>36HVMUx+J=cd< zDqZ83%+Ag>iA13@n zne_&`9qfU%Z)0t39WL%{ht1*R;{)zz1G2eVanL`KN+qpVtkXOjLIQzpqz*G==}1J~ zvSI1(??;Ttx$?vP(Ic>hA1_W)Q>6GhA35-}iLH}la=V29rgg)Q-ydo%26ewb|78dyTU&g)=*~F&h{ud;phFM8egj2&s zY}vt-*9Tv?w0zGNgWaUs-vhKh^D9CMRBObq&shR*FA*|;QSbEB6#5}H5(6>gJPeP; znkOm6`~*pfBi$XS6cnVKpY6~&(|s!mmr>Gc>Rd@{@&nnT08LVdl%%KbB8@4tv95vP zclZDSj?FGNd`gsG+1>_y>VL*mN;pKGLc9@BE)qdc;Z!g3064COqg$9mpVMTY&&lN~ zEGyq`+y0Se);!xo>0f7XMO-`vY4rH=rYoNQ{ zU;$E6JzZT4%+SN7r~ZOcZZcAe#n@9(6t1qXPp+~u%)(!u!lmp6Mw=acS6cGIvV5Go z`Eq8-p@_ucl%e;HkQmmoxtyr`;?CbUJVscJC7M3f$v*&Oel{OC?PfcB3ONY<1~Ci9 zux*}TIswiCJAWr)^4`aT!R`8m_3!N}f{U=7g3jFS) zzm{!7Pg9+2=YnIF-weX|urw*at*~b2kfu3{1O)M@kQVq3Bpm)l?^LA}lfP2;c832a zPwYR_xc|Z&3&ns8sY;ndwF9o|rIm0glE++B`+ot)*#B1W&9e|amo2sDE6BMBC$l(t z6sl!`4FSt5lt(MjH1bI(DKTm4@3jFW^ABsfYY##P3kana$dv@RWt`ukW63>Y>fcLi zcHoYbR+|sG#%>hY7^X`#|GdDlyAvEFdvKqf@o-;i#C2O+Vt0cQf?3C?-*tbx+itsC zaQZ8oZ9!)7htN;M=r~8n>}O}qC!0)d7S@&4L*2qD))Jd!EVm_*Th#&90%plIpzWjFl2`_51^5F zvwwfI4Zza^?(t*jbs0Ja@~y}MKOj!lIEPQ7-os5_qKH1m#*$TbB+6q=#}ol3f70?A zs)lSwuHMO6`HR(f02jVHrGPnHY*C05ZYt*#VJ|Mwy&nS_c$Gmm(iT51_+R^iE<>yW zNzBF!i-10S7mbdViU8F=rn0iqdRlJTqU-x3q@f6fv@n2~IXYMVa;bD(Nf0yCINzN* zyl&+4z*9}|i-WTs!4BX+)7}hvAm3!cK1s>Rl$4Y;Szl|wwUi5KmbdA}{toUE$)gi_ zWV_SblFZ`X5hsy@MHMATABfe`+3%(jNsK9d1{6h+R`n#;*{sO{`^~f^U1W1uqlb1v15q&Dic6c1qta-e=h6a4(72MUgQIG zQpEhL7stu{*h#WyQ0$N(?0r=xNQ2Y>1kqOL#VP)HAy|d zuK;VK;R1ce^}_UAD{fKyr77q!K9)wVn$y2m_w)uoKil=|mILu;`-RSVfSSzDf+0cu zM+UAc!EXResLXDw7N8}AJKoCM2#duo4B8)BYe5%{KQ#}_<;xyr&f6WSYCItC{r{~s z!Ek}M2s9^0heq8n@^f{E-hYydH{K#miGY>QY};-vXx!#k_4C0Ae69o&188Fe$z!B-DQ0o&!1c3dphGqIH+UHn7{k^#%c3K-deI?11zU zT_2GG0FQ&s_On~JU?{guqWL4!eY!3C?P2>|;9_2+m!6K712x4$#j?1LSm9q6e2?+qe7fxUHmMubA(@LSa*Bd`+PDku)J#o6urpkste<7Ew z`EaYSqJMOda0IG*goy16?3z}=ODoOHbn3Kk)`IXon{=&0YnU-59Ua;k2Z|EeD?Y(?nN*3pw~S;evBxb;Dw1_S(uUZf}! zlY)jWT2Mwehe;?*D>qhZh;8_yFO{vm_C4C2ko?Ocw>qZG_;|dD+sh_i%?m25X}G|l zB73|sxg)Rgr8cA#$8~j1REaqvy2%6W$4J3W@#>)b;^+LX;IwV=5cyb5kOaXxrQCd; zESx?PpH#T;^WAB4$`|B5zU1No7Ae{NZm2?1`eRAPlS0xG~RxiN{yh$~x| z8qTR2&_^H44_)keUG)66Jm(?Ts_9UYnd zX%Vdjot9H+aH-RJUV)%NX~udZ42=vVrE@p@_E`UzlSu(6Mref}XOMvyw^CWJy^=tM zS#sx1T{wU2p?X5ZU!6m)KPc5-#u59=EnGaYv499bDNHv{bGH7iVh?s-%jz>`pgf%D{Il8IeH4V5k;|Njil`gA8t0x#5PT-8`(gi^8vr2QP#~ z6&z)6ji_gyv69#j9(t=v65-9S?fw=X+HrYjKc+$-`!Y0ZmPBhw_$V}5JTnWd8Jvk` tZkKrb@87=zg`|-$SadOIK|Mcu^!usgY^kvod^H>;drwI^hc3h05Gr-S%Bdaqv03qE3G5`Po delta 14 VcmX>uc0!D`Gr-TCcO#24HvlD31U~=( diff --git a/doc/salome/gui/GEOM/pics/isos_u12_v12sn.png b/doc/salome/gui/GEOM/pics/isos_u12_v12sn.png index 10a13ce4b8219ff94513110ab2f040de5ad5ce99..32fce20b2c573cde73079ebe89efc9b343495da1 100755 GIT binary patch delta 20 bcmeBN#MHisiKR2Z&wV57pZLv83G9XdPnicP delta 22 dcmZo)#MHTniM2Dp&z*N8%b$2g-c1SYh5%Vu2SES; diff --git a/doc/salome/gui/GEOM/pics/line.png b/doc/salome/gui/GEOM/pics/line.png index 3c931a1e9a4f2270e5d79b3ec2f3d2762eaf8911..001b30f83b0629e87df5150f75cdecca85ff3e1a 100755 GIT binary patch delta 29 lcmews{3V#BGr-S%BP*K(6PLwgK{2t({OVkr^(0OR0sxar2#^2( delta 31 ncmewo{4JQZGr-TCcOwg%1T!y}#bg07vB~v9T$^n+a delta 14 VcmaDP^jL_sGr-TCcOy$2Cjcko1cm?r diff --git a/doc/salome/gui/GEOM/pics/measures1.png b/doc/salome/gui/GEOM/pics/measures1.png index 6d5d698b4ef83462a01fde543b1f0deb367d696c..02366195d56f62f841c5644b10e62eeb6a59ab2c 100755 GIT binary patch delta 13 UcmcZ}crB2nGr-S%BkLs%04b6MasU7T delta 14 VcmcZ>cs-D{Gr-TCcO%Os4FD~g1%Chl diff --git a/doc/salome/gui/GEOM/pics/measures10.png b/doc/salome/gui/GEOM/pics/measures10.png index 33023cc49af841d9fec69d0c50c0b0ac4624c28e..c7ae473cbfda0b512e1b5481aa754b8dc35df26c 100755 GIT binary patch delta 13 UcmeAy>L_CA4DfT`$jV{~03(eATL1t6 delta 14 VcmeAu>MUaI4DfU3-N?dX2>>TM1ZV&N diff --git a/doc/salome/gui/GEOM/pics/measures3.png b/doc/salome/gui/GEOM/pics/measures3.png index 9a55aad4afbc44ba5e49931cdc14584185f9edbe..a5bae52085110cb3cfd64d3a88b7886a9a272271 100755 GIT binary patch delta 18 ZcmexV@S%XEGr-S%BddeTW;Ycb5dck#2CM)8 delta 21 ccmexR@Tq{cGr-TCcO#2~3M21k7Zn{509{H3#Q*>R diff --git a/doc/salome/gui/GEOM/pics/measures4.png b/doc/salome/gui/GEOM/pics/measures4.png index ea243e88804b1c0bc6c9279d894938ff59795e7e..778a00fc720f59db253a97ce12c82309df1a6990 100755 GIT binary patch delta 15 WcmccK#dxiYk)<=h&wV3nkShQ&&;^44 delta 16 XcmccC#dy7ok+n0x&z*N8OOPu7HcJJN diff --git a/doc/salome/gui/GEOM/pics/measures5.png b/doc/salome/gui/GEOM/pics/measures5.png index a323426e60197e1a2c0d314c054ba611a1e47e21..2e0f61eec6bae355cb122b41ec21a67e65987463 100755 GIT binary patch delta 13 Ucmdm3w4sQlGr-S%Bdd-j04JRU(*OVf delta 14 Vcmdl`w6Tb_Gr-TCcO#3AB>*d%1mFMw diff --git a/doc/salome/gui/GEOM/pics/measures8.png b/doc/salome/gui/GEOM/pics/measures8.png index 94bed3271dafc7a5005200bd1e9bdca605b232b6..34ca9f8f52bd5777c479fab9d8cea85050f6be02 100755 GIT binary patch delta 15 WcmbQ+$T+8wk)<=h&wV573hcwCUBGr-S%BkN%f03vJzr2qf` delta 14 VcmX>uctVi1Gr-TCcO%PT4ge+A1hN1C diff --git a/doc/salome/gui/GEOM/pics/mirror_axissn2.png b/doc/salome/gui/GEOM/pics/mirror_axissn2.png index 6009fa7cf98f7518ac1805010190afd4768a475d..65d2c891570cd66d17a7f2d76983e2dfe4f77f2c 100755 GIT binary patch delta 13 UcmcaEeNCFBGr-S%BkLtz03_1{>i_@% delta 14 Vcmca6eO;QhGr-TCcO%OsUH~X>1o!{| diff --git a/doc/salome/gui/GEOM/pics/mirror_planesn1.png b/doc/salome/gui/GEOM/pics/mirror_planesn1.png index 969f0e0f4fa3c8b37822cf2b6b13847635acbaca..c52861f6b77ad8b34132c5eac1997356fbc976f9 100755 GIT binary patch delta 13 UcmZ3cvQ&koGr-S%Bdeki03W0S?*IS* delta 14 VcmZ3gvP^}wGr-TCcO#3U5C9_Z1N;C0 diff --git a/doc/salome/gui/GEOM/pics/mirror_planesn2.png b/doc/salome/gui/GEOM/pics/mirror_planesn2.png index e9eb4966dc54f942eb58bf0b41c2af1448732db8..a2aaf67a38314056e5effde9653b0c66ae558197 100755 GIT binary patch delta 13 UcmZ3cyHuB@Gr-S%BkMvj03mJ!g#Z8m delta 14 VcmZ3gyG)n0Gr-TCcO%O}F#sgY1d;#% diff --git a/doc/salome/gui/GEOM/pics/mirror_pointsn1.png b/doc/salome/gui/GEOM/pics/mirror_pointsn1.png index 675b0bff1b8147d0d1f2027e8c91d1f0cb99fa54..8c2fc2a0a64c28f8f1818dce2354ba1337bd1225 100755 GIT binary patch delta 13 UcmZn=`Y*`R8Q|x>k@YtR03oOZ&Hw-a delta 14 Vcmew_*dWB(8Q|y6yOHHL2LL7k1ls@r diff --git a/doc/salome/gui/GEOM/pics/mirror_pointsn2.png b/doc/salome/gui/GEOM/pics/mirror_pointsn2.png index ab62359060417af05f9c1168017a1f2c081f7c28..bad55780c27b2eebdabdc9c4adcb5b71f1b93b6b 100755 GIT binary patch delta 13 UcmbO&J4=?OGr-S%BkMFi03PTBJOBUy delta 14 VcmbOwJ6o2uGr-TCcO%O*J^&&R1W5n@ diff --git a/doc/salome/gui/GEOM/pics/mtrans1.png b/doc/salome/gui/GEOM/pics/mtrans1.png index 7dfe730c375d34cf8b37b043a3b9e4f2b67573e9..fc9efdef29ebff8aad218e7752a3ab3b48eedd27 100755 GIT binary patch delta 13 UcmaD{^QeZUGr-S%BWs);04s09-M delta 16 XcmZ2FgK^mmM%K;%KX=}ZEQ&q=G2I0q diff --git a/doc/salome/gui/GEOM/pics/mtransf1.png b/doc/salome/gui/GEOM/pics/mtransf1.png index 207e920f9ca612daef5a63f9dc5447e6b35f1581..39a6dd1d26b602b745cd69750e63013372fb52c8 100755 GIT binary patch delta 15 WcmaFW%J{OCk)<=h&wV57Qzrm4cLpy2 delta 16 XcmaFa%J{04k+n0x&z*N8%Tp%+ISvLq diff --git a/doc/salome/gui/GEOM/pics/mtransf2.png b/doc/salome/gui/GEOM/pics/mtransf2.png index 3435f0f8cb88ffc50747e35f5d50967002e6d0df..ca27479c6975980a52ee7ce9a63919720a9dfbe8 100755 GIT binary patch delta 15 Wcmex4kMYMmMwZS1KlhESCH??6s0JGV delta 16 Xcmew{kMZX`M%K;%KX=}ZEG7N`JdXw_ diff --git a/doc/salome/gui/GEOM/pics/mtransf3.png b/doc/salome/gui/GEOM/pics/mtransf3.png index 628d8b0a634fd410686589d102839957e8123888..f853924c0b1491638512d9cbcf3cc316165b6dd3 100755 GIT binary patch delta 13 UcmbP|GdYK)Gr-S%BP+id03;*?Z2$lO delta 14 VcmbQ7GbM+$Gr-TCcOwhG82~5T1bP4f diff --git a/doc/salome/gui/GEOM/pics/mtransf4.png b/doc/salome/gui/GEOM/pics/mtransf4.png index cbe904444dcf774e376fd082cc7662371e33b5ab..c4a74b05e00f17ba0d930d28d14b4767e75e5170 100755 GIT binary patch delta 18 Zcmccaebt+#Gr-S%BkM%j&C_KaH~>hk2FL&a delta 21 ccmccWechY2Gr-TCcO%P0Sw`N?Q)L}E09Swp;Q#;t diff --git a/doc/salome/gui/GEOM/pics/multi_rotation1d1.png b/doc/salome/gui/GEOM/pics/multi_rotation1d1.png index 4085f434ba1ba0e703c8cd39b3716419e1c8aed2..4627fd92a1942f018ee0ed5fcf7427541a52578b 100755 GIT binary patch delta 13 UcmX@3cv_LAGr-S%BkOSi03V!Z delta 14 VcmZ2yzuum;Gr-TCcO%Oxc>pJY1lj-q diff --git a/doc/salome/gui/GEOM/pics/multi_rotation2d1.png b/doc/salome/gui/GEOM/pics/multi_rotation2d1.png index 1bdd25302adf020845ddf671e6cebf3158f2aeeb..5c103bc3ab878dd8fb8bee4af171f290daeacab3 100755 GIT binary patch delta 13 UcmX>saY%xtGr-S%BdZ+`03nD3C;$Ke delta 14 VcmX>kaae-2Gr-TCcO#1(4*(?g1T_Ev diff --git a/doc/salome/gui/GEOM/pics/multi_rotation2d2.png b/doc/salome/gui/GEOM/pics/multi_rotation2d2.png index aa61ca606a471e33343d8b838b9c214082236ff1..2942ef68ab00afe8b539d55f6d9d24930249d552 100755 GIT binary patch delta 15 WcmaFa#Q36#k)<=h&wV3niX#9s4h5wE delta 16 XcmaFS#Q3s_k+n0x&z*N8ONt`^H=PBt diff --git a/doc/salome/gui/GEOM/pics/multi_transformationsn1d.png b/doc/salome/gui/GEOM/pics/multi_transformationsn1d.png index dfcc440aec91ebbb0f42f78b476ffcc4b1a86644..1b0b89bec855902c64c9999cc050b9aea4daf5a4 100755 GIT binary patch delta 23 fcmbOhHaU!?Gr-S%BWoAO<_R3Dm^WMV+?E3XXe$VN delta 28 icmbOnHZ6>`Gr-TCcOy#|2P5z1K8{t)K+1yWwj2P1g$SPj diff --git a/doc/salome/gui/GEOM/pics/multi_transformationsn2d.png b/doc/salome/gui/GEOM/pics/multi_transformationsn2d.png index f0fc1279c92f23920a783b28c9135927e01a4e74..25836a4b3c34573f07a849bf84099c5f776dcaf4 100755 GIT binary patch delta 13 Ucmewz`74s8Gr-S%BkMOE04?qX@&Et; delta 14 Vcmewr`8$%eGr-TCcO%O;9RM;;1^)m5 diff --git a/doc/salome/gui/GEOM/pics/multi_translation1dsn.png b/doc/salome/gui/GEOM/pics/multi_translation1dsn.png index 436a8169a6bca0a11ceae856e81dd7501947a5df..6f151da84e4e9127205534ee8e409c13aa3c36be 100755 GIT binary patch delta 13 UcmaDP_fU?dGr-S%BWo-_03|g9lmGw# delta 14 VcmaDT_ehSlGr-TCcOy$IKL9B01fc)` diff --git a/doc/salome/gui/GEOM/pics/multi_translation2dsn.png b/doc/salome/gui/GEOM/pics/multi_translation2dsn.png index f44c8520eedfb2ab41920f7acb44716f8ce78f1e..f7629c61c30e1cb33d31632b677688a2fdc6a6fc 100755 GIT binary patch delta 13 UcmbPdJJ*(_Gr-S%BkN2#03rqil>h($ delta 14 VcmbPhJI|K2Gr-TCcO%P8IRGVe1fl={ diff --git a/doc/salome/gui/GEOM/pics/multi_translation_initialsn.png b/doc/salome/gui/GEOM/pics/multi_translation_initialsn.png index 0b7b70afe34865d92e491e4577bbbddfe9559e1e..a816e2f2c1f6b16f6bf762f0b054965353e3dbaf 100755 GIT binary patch delta 13 UcmaDS@K%7OGr-S%BWorH03|X6l>h($ delta 14 VcmaDW@J@iWGr-TCcOy$C2LLGM1fl={ diff --git a/doc/salome/gui/GEOM/pics/neo-basicprop.png b/doc/salome/gui/GEOM/pics/neo-basicprop.png index 2a9d7ca2a908d5410c921653d07fb5f87fc65d6d..4c38db476b4045d7857ea524afdbc39a4f0ce380 100755 GIT binary patch delta 13 UcmexW__L6uGr-S%BkNZS059+cD*ylh delta 14 Vcmexa_^Xh$Gr-TCcO%PJ3jj2J1~>o! diff --git a/doc/salome/gui/GEOM/pics/neo-detect2.png b/doc/salome/gui/GEOM/pics/neo-detect2.png index f0dabe311d338af72e518f734344895efc939200..a1f5be98d00780e94ed88cdd70bab33a7c3ac6e7 100755 GIT binary patch delta 13 UcmX?Sch-)jGr-S%Bde!8044ndr~m)} delta 14 VcmX?Wcg~KrGr-TCcO#3ZJOC-p1hoJF diff --git a/doc/salome/gui/GEOM/pics/neo-isos.png b/doc/salome/gui/GEOM/pics/neo-isos.png index dbbcf8ef534ca0fa2e5f1520528e7286c2661542..e01a060ed0e4d641a2f2fe9c3cf903adb056dec3 100755 GIT binary patch delta 13 UcmZoNZ!~A=4DfT`$XY8603N3VG5`Po delta 14 VcmZoPZ!%}?4DfU3-N;fa4FDn01U~=( diff --git a/doc/salome/gui/GEOM/pics/neo-localcs1.png b/doc/salome/gui/GEOM/pics/neo-localcs1.png index 9bdacafa251f8537bd29c5b5adee370e6cf7aead..07ca3e185f7da1af4dfbe26f1c9211a4bd0c287a 100755 GIT binary patch delta 15 Wcmdnp$+)YNk)<=h&wV57HWvUdiUq6y delta 16 Xcmdnh$+)|dk+n0x&z*N8%QhDPGs^|J diff --git a/doc/salome/gui/GEOM/pics/neo-localcs2.png b/doc/salome/gui/GEOM/pics/neo-localcs2.png index 3fc54a67ce73f3a8063668d7ebe59b20fbaaadef..8609ca692a7a33fae6b3df1088ef9290d8090b80 100755 GIT binary patch delta 13 UcmbQ6HYbgxGr-S%Bddfl03?S5c>n+a delta 14 VcmbP}HaCs6Gr-TCcO#30F#sq<1cm?r diff --git a/doc/salome/gui/GEOM/pics/neo-localcs3.png b/doc/salome/gui/GEOM/pics/neo-localcs3.png index 01c8e24fa2b9ea0458cfe7a59fed328d3399d68d..605c5aaa253e3a00b5f6051ebd683bea04e13d77 100755 GIT binary patch delta 13 UcmcarezTmVGr-S%BkNUb04+BK+5i9m delta 14 Vcmcaveyg0dGr-TCcO%PHYXC8k1?K<& diff --git a/doc/salome/gui/GEOM/pics/neo-materials.png b/doc/salome/gui/GEOM/pics/neo-materials.png index 66917490cdb8f0ff9a36c5efe8dd7ec628c15507..268bc2b1bc292086cd19e94b8676966aafa2b9f9 100755 GIT binary patch delta 13 UcmZ3Jx;mAmGr-S%BkOV_04DYYBLDyZ delta 14 VcmZ3Tx+ayiGr-TCcO%PkBLFJU1uy^r diff --git a/doc/salome/gui/GEOM/pics/neo-mrot1.png b/doc/salome/gui/GEOM/pics/neo-mrot1.png index 6cf2ab91b6fe7d8fd92a1ed0e7d2d6f38cfe66bf..c08a0593c703eb547c167a4a8f9c7a6c72270230 100755 GIT binary patch delta 13 UcmX?DaG-#tGr-S%Bdd)C04Wdz{r~^~ delta 14 VcmX?5aIk>2Gr-TCcO#391pqB71q%QG diff --git a/doc/salome/gui/GEOM/pics/neo-mrot2.png b/doc/salome/gui/GEOM/pics/neo-mrot2.png index e2f37e0527d31486e11c3a981d50f9f3a1f6f497..82437545762f415eef8a934d0c7450e36a52dfee 100755 GIT binary patch delta 15 WcmZ4A$+)hQk)<=h&wV57Di;7QE(M4H delta 16 XcmZ42$+*6gk+n0x&z*N8%PJQDGFJta diff --git a/doc/salome/gui/GEOM/pics/neo-obj1.png b/doc/salome/gui/GEOM/pics/neo-obj1.png index 88a7a8b8a892c069aef47857a6ebefbce68ff238..0cf7629a40b5076ed4f0db00269a9c17fa95549a 100755 GIT binary patch delta 13 Ucmdm+z9*ffGr-S%BkK-h04UuBTL1t6 delta 14 Vcmdm!zBiqO diff --git a/doc/salome/gui/GEOM/pics/neo-obj2.png b/doc/salome/gui/GEOM/pics/neo-obj2.png index c940eaa38f4cc7c6f8c0e9bb06fb9cf25e1bdb20..e85e63bcd575905084513487350ca57719c26bdc 100755 GIT binary patch delta 13 UcmZn&{~yNE8Q|x>k+oVI04BKv`v3p{ delta 14 Vcmew#))3Cx8Q|y6yOE_@8vrYu1qc8D diff --git a/doc/salome/gui/GEOM/pics/neo-obj3.png b/doc/salome/gui/GEOM/pics/neo-obj3.png index d773938e2758a7ca1a513b54f9cbe694551e44ab..3ec4bb87ec558a21eba13bcc63594b4644121ecb 100755 GIT binary patch delta 13 UcmZ1$yEK-iGr-S%BkMvv041gb{Qv*} delta 14 VcmZ1)yDXNqGr-TCcO%O}Jpd_W1quKF diff --git a/doc/salome/gui/GEOM/pics/neo-obj4.png b/doc/salome/gui/GEOM/pics/neo-obj4.png index db5d497159b2af5f9ff007ef675d0a2586e11ce2..3d9de24ded0f8a1d4219e1b5c4bec23fb8679548 100755 GIT binary patch delta 13 UcmZ1*wh($ delta 14 VcmZ1zw>FNoGr-TCcO#32J^(2}1fl={ diff --git a/doc/salome/gui/GEOM/pics/neo-obj5.png b/doc/salome/gui/GEOM/pics/neo-obj5.png index e1579f082403ed62cfca3e0872f5850901b6a74b..93b28180028ebb42848e5e0f3e896b8bf1fcf2a9 100755 GIT binary patch delta 13 UcmeAP?+$0_4DfT`$l9(A03v$?pa1{> delta 14 VcmeAU?+It^4DfU3-N@3e4FDzi1g!u7 diff --git a/doc/salome/gui/GEOM/pics/neo-obj6.png b/doc/salome/gui/GEOM/pics/neo-obj6.png index b6b3be4409089cadf829ac0dab8614cb6bc59646..b6e819a5b986799668ca5d440d04551a4849d3dd 100755 GIT binary patch delta 13 UcmcbUcsr4$Gr-S%BkOeo04sb2sQ>@~ delta 14 VcmcbecqfsyGr-TCcO%Pn0{}0s1-1YH diff --git a/doc/salome/gui/GEOM/pics/neo-obj7.png b/doc/salome/gui/GEOM/pics/neo-obj7.png index 15dfa23765872e6f56121e4df094e20d6c291d05..aa458d90fe36d2d05f1bdc4858859de24eea7f2c 100755 GIT binary patch delta 18 ZcmZpVZH;B=4DfT`$Xc$mxmJgZ2>?Gt1^NI0 delta 21 ccmZpTZI5N`4DfU3-N;g|!^pe2T8E1X08EVr6951J diff --git a/doc/salome/gui/GEOM/pics/neo-point2.png b/doc/salome/gui/GEOM/pics/neo-point2.png index 3bc59b860941c4c0a892f3d8a627d3f2c6444b46..2dbebff3f8cd41ebd844bd88e1ffcb538e7ed778 100755 GIT binary patch delta 13 UcmZ2cwY-X@Gr-S%BdfA404HYz%m4rY delta 14 VcmZ2pwW5l(Gr-TCcO#3kEdVQH1la%p diff --git a/doc/salome/gui/GEOM/pics/neo-scetcher1.png b/doc/salome/gui/GEOM/pics/neo-scetcher1.png index 7130e8b0827131d778bceb29f058d6fba5630f7e..a799585477a975b48dd81d703b99823e9e1e6e08 100755 GIT binary patch delta 15 WcmbQ)!Z@Rak)<=h&wV4Sh!X%RF$B5* delta 16 XcmbQy!Z@>qk+n0x&z*N8i-;2dE+hoU diff --git a/doc/salome/gui/GEOM/pics/neo-scetcher2.png b/doc/salome/gui/GEOM/pics/neo-scetcher2.png index 330e1e3a355b324b9fb6c1aa96a2bda1563efb19..b492066ff1bc639be7126b8aa2636bdfca62118f 100755 GIT binary patch delta 20 ccmX@TjPc|$MwZS1KlhES_57P#`HwjR09Nb==>Px# delta 23 fcmX@PjPdj`M%K;%KX=}ZEcN`1yqlZ(k2wPXXI%&a diff --git a/doc/salome/gui/GEOM/pics/neo-section.png b/doc/salome/gui/GEOM/pics/neo-section.png index 0d58ad2449132e77f5487e0ccce2808c668c57ce..b464f45611290e3638118a048e9a0472a1b80b2c 100755 GIT binary patch delta 13 UcmaEz`6`p8Gr-S%BkMC004=r!>Hq)$ delta 14 VcmaEr`8t!eGr-TCcO%O)696(61@`~| diff --git a/doc/salome/gui/GEOM/pics/neo-transparency.png b/doc/salome/gui/GEOM/pics/neo-transparency.png index ec1fb7f7065b0f3bd5d2cf710afc863a80455529..b3c0fcd8e81ea183aa085e0e4e6606d746ed2cad 100755 GIT binary patch delta 13 UcmZoL`)|t98Q|x>k@dF}03^}{C;$Ke delta 14 Vcmexw+F-`o8Q|y6yOHI$6aXo61vLNw diff --git a/doc/salome/gui/GEOM/pics/new-tolerance.png b/doc/salome/gui/GEOM/pics/new-tolerance.png index 796115ba90629a1d9fd8841230e4389b771263d7..f3ca7c201adba8cbd50a4c224f124debba353816 100755 GIT binary patch delta 18 ZcmX?n%^%o<^Z`wq2crN0 delta 21 ccmX?*cPNjwGr-TCcO%Oyc1GUK@7RO%0bNK3yZ`_I diff --git a/doc/salome/gui/GEOM/pics/offsetsn.png b/doc/salome/gui/GEOM/pics/offsetsn.png index 6404310e03a92367697339bdaa78d1a20e962225..35191e261009ed8ac34cd20aecf72664381280b9 100755 GIT binary patch delta 13 UcmdlUzb&4nGr-S%BkLx804I$FH2?qr delta 14 VcmdlMzdfF{Gr-TCcO%OteE=(Q1wsG- diff --git a/doc/salome/gui/GEOM/pics/partition1.png b/doc/salome/gui/GEOM/pics/partition1.png index eb6bf4305c6100f20ecd2fb05a5e3ef7c4c83ef6..102ea403b26696804a799b0404c67af934159207 100755 GIT binary patch delta 15 WcmX>wg>nBBMwZS1KlhES)?NTGGzC`x delta 16 Xcmdl#h4H`?M%K;%KX=}ZEY@BCG?fKp diff --git a/doc/salome/gui/GEOM/pics/partition2.png b/doc/salome/gui/GEOM/pics/partition2.png index bd388a5fb40b042341c8969dae3cb200b4db74e6..b20882c5c7236ba9f0596e88d1203e27294f98e1 100755 GIT binary patch delta 13 Ucmdm3wV{foGr-S%Bdd-r04Pxe=Kufz delta 14 Vcmdl`wXuq|Gr-TCcO#3AEdVTE1oQv^ diff --git a/doc/salome/gui/GEOM/pics/partitionsn1.png b/doc/salome/gui/GEOM/pics/partitionsn1.png index fa8404de423edf7b2c2f10bab4f88be553ea2102..8638f5914e09f59b4eb2952ed056183fbc0d2dbe 100755 GIT binary patch delta 13 Ucmdm{yH%H^Gr-S%BkM*n03!|rwEzGB delta 14 Vcmdn0yG@t1Gr-TCcO%P2F#slv1i}CS diff --git a/doc/salome/gui/GEOM/pics/partitionsn2.png b/doc/salome/gui/GEOM/pics/partitionsn2.png index b7480a4fa333ab8a62c25880bdc5e449ee67bdd5..0726107e718c0bdd875e9442a1f9f445ce4c547f 100755 GIT binary patch delta 13 Ucmdn4yiJ*#JQ1gro6 diff --git a/doc/salome/gui/GEOM/pics/pipe.png b/doc/salome/gui/GEOM/pics/pipe.png index e773731d23220ff8bde35e4232d9fa8e4e4cc35c..a36850e34262f319259e72705d4801636e0faab2 100755 GIT binary patch delta 23 fcmZ3NxH^%gGr-S%BdZPLW+%o~I-B3>9%KRlYX1n` delta 28 icmZ3TxGs^kGr-TCcO#1pBO~u-2gX%8Kf1aPEGr-S%BkO5)03#0sxBvhE delta 14 VcmX@le}SL1Gr-TCcO%Pbb^s=Y1jPUV diff --git a/doc/salome/gui/GEOM/pics/pipesn.png b/doc/salome/gui/GEOM/pics/pipesn.png index 11ac1096ba903991420643febf924d929b84ebe3..256b49d05bbab5de3aa00032852a30109321bdb8 100755 GIT binary patch delta 13 UcmcZ^ej}WvGr-S%BkL7y04hxdhX4Qo delta 14 VcmcZ+elwi4Gr-TCcO%OcZ2&H11(W~) diff --git a/doc/salome/gui/GEOM/pics/plane1.png b/doc/salome/gui/GEOM/pics/plane1.png index 47a9b8bcdabb3ac9d803b779a0c07a9c7ebae69d..a04af45528eb8db4960065656a13b15eaaade0e3 100755 GIT binary patch delta 13 Ucmdm$wlj^TGr-S%Bde(~04I3_&;S4c delta 14 Vcmdm)wkwUbGr-TCcO#3bF#s!Z1l<4t diff --git a/doc/salome/gui/GEOM/pics/plane2.png b/doc/salome/gui/GEOM/pics/plane2.png index f4b880b448f96987d5309bfb4974a864778dd6a8..aeb928f418221b22938d7cb8905d43a88daf7da1 100755 GIT binary patch delta 13 Ucmdm(y&;>WGr-S%BkLMd04M(iK>z>% delta 14 Vcmdmxy)m1$Gr-TCcO%OhQvfUP1x^3} diff --git a/doc/salome/gui/GEOM/pics/plane3.png b/doc/salome/gui/GEOM/pics/plane3.png index bce5623509cc556e576caeee33d390245534dbc4..3a04aa4acc9502381eab0b99cd69baf189491998 100755 GIT binary patch delta 13 UcmZonYDi+~4DfT`$oj_s03%cd8UO$Q delta 14 VcmZojYD{A74DfU3-N^FC001V^1t$Oi diff --git a/doc/salome/gui/GEOM/pics/plane_on_face.png b/doc/salome/gui/GEOM/pics/plane_on_face.png index 5df8823cdb4f96a7f4d056aae88070dfc924e803..c79887f1a6ba67cd9032397e7bb67f97bc47b803 100755 GIT binary patch delta 13 UcmZ21vPgubGr-S%BdZ)203GfFz5oCK delta 14 VcmZ1^vRH(*Gr-TCcO#1&7XTp?1Iqva diff --git a/doc/salome/gui/GEOM/pics/planes1.png b/doc/salome/gui/GEOM/pics/planes1.png index c9a594ceecea1035f0dd88e0d6a64cb9560db8f5..54286b02aa05a536c5764bc68f30c153f532ddde 100755 GIT binary patch delta 18 ZcmX@1a7=-vGr-S%BWpCr=0uL?>;ONF24nyL delta 21 ccmX@6a6*B#Gr-TCcOy$Q2P5z1c#h}n08DNMeE3ji#-1!DjJ diff --git a/doc/salome/gui/GEOM/pics/points.png b/doc/salome/gui/GEOM/pics/points.png index 547b277fdcbee4a21cbbada934f25252b69ac7c3..e26d63fa503ed6f8294aa3d5b630a8b5d2b6d0bc 100755 GIT binary patch delta 13 Ucmew>_D77RGr-S%BWndW04F~L(EtDd delta 14 Vcmew(_E(IxGr-TCcOy#$HvlUg1l|Au diff --git a/doc/salome/gui/GEOM/pics/polyline.png b/doc/salome/gui/GEOM/pics/polyline.png index bd259e120d78d271767b993ba2c8307fea2f0a3f..5c751e5664c950b265a5d965c5a95ab8b6f4ea6d 100755 GIT binary patch delta 13 Ucmew>`bU(dGr-S%BkKGr-S%BkO;I$*hKz07{hySO5S3 delta 20 bcmey9^e>6EGr-TCcO%Px14iD-%!ZW!Tg3-) diff --git a/doc/salome/gui/GEOM/pics/repair3.png b/doc/salome/gui/GEOM/pics/repair3.png index 4c2a41f9001a120b98cd681fde2c6257501de24b..e37175bd34b0f627cd62d83055761bd0dc5bd897 100755 GIT binary patch delta 12 TcmZpzYN=xB4DfSb$Z87!AAJx)&Kwi delta 14 VcmZoEZ7pT(4DfU3-N@2l1pp`%1mgez diff --git a/doc/salome/gui/GEOM/pics/repair6.png b/doc/salome/gui/GEOM/pics/repair6.png index 5123d1f841286f649175afca327df4fb17c53742..74982f294b2c791f7804fc6d803ab6c416383c63 100755 GIT binary patch delta 13 Ucmdl{y1kU8Gr-S%BkN`>04bIQZvX%Q delta 14 Vcmdm9x}%h}Gr-TCcO%PYD*!F11$+Pi diff --git a/doc/salome/gui/GEOM/pics/repair7.png b/doc/salome/gui/GEOM/pics/repair7.png index 2b553b9fd6f429e9ddb86e9b8d152b78cba22f32..7fc9d3f6ed49693a0eb56aee17a777222e370796 100755 GIT binary patch delta 18 ZcmX?>a3q1HGr-S%BP)~MW)3|&CICZq1k(JvV03+!HW&i*H delta 14 VcmeCrn~=xa8Q|y6yOD+48~`Vs1aklY diff --git a/doc/salome/gui/GEOM/pics/repair9.png b/doc/salome/gui/GEOM/pics/repair9.png index 7f5d4f5c3ab09ecc285b80f1fbb6eef41dadacc6..d3160dc30127931267266809cbc411d956c1c234 100755 GIT binary patch delta 13 UcmaFj``DMIGr-S%BkO%N04j diff --git a/doc/salome/gui/GEOM/pics/revolutionsn.png b/doc/salome/gui/GEOM/pics/revolutionsn.png index 7242c671010b19fa8710a515516872ca3a62e614..75dae6f55924223a05ff63a1c004c0dd4c4f034f 100755 GIT binary patch delta 13 UcmaFu^2&v!Gr-S%BWs!x04a6_4gdfE delta 14 VcmaFm^4f*9Gr-TCcOy%h5&$iX1sebW diff --git a/doc/salome/gui/GEOM/pics/rotationsn1.png b/doc/salome/gui/GEOM/pics/rotationsn1.png index 697dcdedf45f54e6a72bd2304ac0250a299c919b..f570c2c0b303eefd46dcdf5063b57bcce423de0f 100755 GIT binary patch delta 13 UcmX?Qe$t$!Gr-S%BkNIV044VY3IG5A delta 14 VcmX?Ue#)G+Gr-TCcO%PDX#gp)1s4DS diff --git a/doc/salome/gui/GEOM/pics/rotationsn2.png b/doc/salome/gui/GEOM/pics/rotationsn2.png index 741d00c90799fafbaad0b7fe2dd6c90daa8cb7e9..78b024f97d7c512e23143b920d16d6278d4a680a 100755 GIT binary patch delta 13 Ucmewo^f`#7Gr-S%BWu1U04tjXOaK4? delta 14 Vcmewy^d*S3Gr-TCcOy%_CIBzr1z7+9 diff --git a/doc/salome/gui/GEOM/pics/scale_transformsn1.png b/doc/salome/gui/GEOM/pics/scale_transformsn1.png index 5af390922ca3defddebe895782aedcd0bdf6fade..39e043a6d8a92547f2ff2d025e5baf7e4ffcb745 100755 GIT binary patch delta 13 UcmeyR@Kb@MGr-S%BWtMu04LG};Q#;t delta 14 VcmeyV@JoTUGr-TCcOy%w001k#1nvL; diff --git a/doc/salome/gui/GEOM/pics/scale_transformsn2.png b/doc/salome/gui/GEOM/pics/scale_transformsn2.png index fa76d41589b5fe51b5caa1dfdf4a937a1c837308..67d9d35c3f564e6ffbe69ca86dd1a9bd3bee2017 100755 GIT binary patch delta 13 UcmeA(=rv&J4DfT`$jT`J03JdE#Q*>R delta 14 VcmeA*=rdsL4DfU3-N?cz0RSO(1JVEh diff --git a/doc/salome/gui/GEOM/pics/sectionsn.png b/doc/salome/gui/GEOM/pics/sectionsn.png index 8e636ee9171f56d6a01fc1fb95312f2f1c59b3c0..ad17160c2894bdf89e6e63268322e7516e3d0b37 100755 GIT binary patch delta 13 Ucmey)_l=LGGr-S%BWn>m0447Ps{jB1 delta 14 Vcmeyy_nnWmGr-TCcOy#?I{+!M1h@bI diff --git a/doc/salome/gui/GEOM/pics/shellsn.png b/doc/salome/gui/GEOM/pics/shellsn.png index c7f22f32387a229457f211ff35b2a0d27756c398..b6881963163419988553e5208c4e7b911d5be357 100755 GIT binary patch delta 13 Ucmca2dRdgEGr-S%BkOrC03-ec(*OVf delta 14 VcmcaCdPS7AGr-TCcO%PrE&wNp1mFMw diff --git a/doc/salome/gui/GEOM/pics/solidsn.png b/doc/salome/gui/GEOM/pics/solidsn.png index 297fc068c290b8c0c74e137a8dc76be4b349f000..327f2cce70ef7993359da52b8c83daaa1fd0fe9c 100755 GIT binary patch delta 13 UcmaE=_C$@PGr-S%BWr>%046sCu>b%7 delta 14 VcmaE&_Ee3vGr-TCcOy%JFaRnA1ikzStL0{~fG2WS8Q diff --git a/doc/salome/gui/GEOM/pics/sphere2.png b/doc/salome/gui/GEOM/pics/sphere2.png index dd2cadb1ffa8b281b721db56507fd76c3379f587..ba23edc288e4df0db37f1dffc8f8e0aef90bf443 100755 GIT binary patch delta 16 XcmcZ{cQKBoGr-S%BCFTN0A_svI*$eB delta 19 acmcZ@cR7x=Gr-TCcOr`yBkx8(W_k)&Kwi delta 14 Vcmdm;wkM6XGr-TCcO#3rF#s#61mgez diff --git a/doc/salome/gui/GEOM/pics/supp_int_wires2.png b/doc/salome/gui/GEOM/pics/supp_int_wires2.png index e6dc3142a5bd3c3d6857c79294504d8cd6484672..a5a04a433a23733f1b077e53425a3282dc283224 100755 GIT binary patch delta 13 UcmZ4ExZ07WGr-S%BkOVn03*x<$p8QV delta 14 VcmZ4OxWg? diff --git a/doc/salome/gui/GEOM/pics/suppress_faces2.png b/doc/salome/gui/GEOM/pics/suppress_faces2.png index d38a4add3194ae907c5bb08e5d88487cfaa7e7d8..604a9fff0cf3d9d13334f1e0fc7ffcf6c7720fdb 100755 GIT binary patch delta 13 Ucmexs{KuH3Gr-S%BkK=I04mD`nE(I) delta 14 Vcmexk{MVSZGr-TCcO%OWNdPY61*QN1 diff --git a/doc/salome/gui/GEOM/pics/torus1.png b/doc/salome/gui/GEOM/pics/torus1.png index 28e18afa036cde6babcf0fe70205b125fd199ebb..e53ed122447303765f0bb58e715d2e16447bdeeb 100755 GIT binary patch delta 13 UcmaEv{UV#CGr-S%BkL1W04=Wt=>Px# delta 14 VcmaEn{W6=iGr-TCcO%OaQvfm#1@-^{ diff --git a/doc/salome/gui/GEOM/pics/torus2.png b/doc/salome/gui/GEOM/pics/torus2.png index 8877f1c372ff230bab53bb5d6c412aa1fa211773..f7a6746af9368b1dcb2befbc47a8990c54f571cc 100755 GIT binary patch delta 13 UcmX?T8Q|x>k(JvD03>h(bpQYW delta 14 VcmeA#nNY&o8Q|y6yOD+43IHfD1cCqn diff --git a/doc/salome/gui/GEOM/pics/transformation3.png b/doc/salome/gui/GEOM/pics/transformation3.png index 96a1f1e36c8336df1c6c975b3e18fab731022984..f604fe36ad60c71d75301d7e865a95e16f37529b 100755 GIT binary patch delta 13 UcmX?BaI}D>Gr-S%BdenY04b6M4FCWD delta 14 VcmX?FaIAo}Gr-TCcO#3V1pqC!1sVVV diff --git a/doc/salome/gui/GEOM/pics/transformation4.png b/doc/salome/gui/GEOM/pics/transformation4.png index 5b177568672e13dc16db04d25baf8a291147416e..78897ead3d0239e1f2326e9bf67b6f703688f6cf 100755 GIT binary patch delta 13 UcmZoJZ7OBy4DfT`$XaIw03Gr-TCcO%OMNdPK?1ug&p diff --git a/doc/salome/gui/GEOM/pics/translationsn2.png b/doc/salome/gui/GEOM/pics/translationsn2.png index 01d695937529cd6d5550046cdc6e9e8aa47992c0..45c3d93e7394b3450d23a68bb973cfbb195b984c 100755 GIT binary patch delta 13 UcmZ1;u`Gh6Gr-S%Bdd}Q03=WZbN~PV delta 14 VcmZ1$u{?scGr-TCcO#3E4ge?y1c3km diff --git a/doc/salome/gui/GEOM/pics/transparencysn.png b/doc/salome/gui/GEOM/pics/transparencysn.png index 0b3638ed1e9a3a6664624c71f83e6a53bacb8fe5..019cb0c3d25402322ce0bdc823167833f3b9b59d 100755 GIT binary patch delta 15 WcmX?em+|ynMwZS1KlhES$MXO=)dsNu delta 16 XcmX?om+{P9M%K;%KX=}ZEXVTzKHvtv diff --git a/doc/salome/gui/GEOM/pics/vector1.png b/doc/salome/gui/GEOM/pics/vector1.png index 46e3b20f3fd00fc38ebaed0e22040c5167796e2b..9f21eba418847c2c44bf2c40f0a88f49135d5011 100755 GIT binary patch delta 18 ZcmX>bb2^5lGr-S%BWtA0=6IQRf&fTu2O9tY delta 25 gcmX>db2f&xGr-TCcOy%r3?uL4Iw7Ua^)hD!0d>U)c>n+a diff --git a/doc/salome/gui/GEOM/pics/vector2.png b/doc/salome/gui/GEOM/pics/vector2.png index bb5c64c5624cfa72d31dc80d5ee9bc6cf4818827..9992e0930a80ad1a0921d6ec916cc753d430a89b 100755 GIT binary patch delta 13 Ucmcbdekq-$Gr-S%BkMV104o^@2X_Df delta 21 ccmewn`YV*RGr-TCcO%PAB}U%OdzGv?0AQ&HkN^Mx diff --git a/doc/salome/gui/GEOM/pics/workplane5.png b/doc/salome/gui/GEOM/pics/workplane5.png index a20eb6021db6a60ebbca8e7e90629f7acdcd377b..b5de2584c7644523581aaf91ef7e292e4d896bfd 100755 GIT binary patch delta 13 UcmaD8|2m$fGr-S%BkOa004(nX)Bpeg delta 14 VcmaDI|0bTbGr-TCcO%PleE=~%1>pby diff --git a/doc/salome/gui/GEOM/pics/workplane6.png b/doc/salome/gui/GEOM/pics/workplane6.png index 5e5134821333e750f8ab0a3fddd5956f10e8f0ca..4b677781f50246adae352e920ff40c839d980ba5 100755 GIT binary patch delta 13 Ucmewu{UMsAGr-S%BkLPo04)~<*#H0l delta 14 Vcmewm{V|%gGr-TCcO%OiT>vp>1?B(% diff --git a/doc/salome/gui/GEOM/webhelp.jar b/doc/salome/gui/GEOM/webhelp.jar index 53b2666365f925aa3d03937608babf0aef95f661..1d1697e7646e8c22cada468b8813c461258493fa 100755 GIT binary patch delta 23 fcmex5i{tYwj)pCai4xnBBp5#)-5zp}QBfZNfz=89 delta 27 gcmex7i{tAoj)pCai4u&w+kwQ#qd+?79;2c@0Guic761SM diff --git a/doc/salome/gui/GEOM/whdata/whftdata.js b/doc/salome/gui/GEOM/whdata/whftdata.js index 071ae6fc7..addf26223 100755 --- a/doc/salome/gui/GEOM/whdata/whftdata.js +++ b/doc/salome/gui/GEOM/whdata/whftdata.js @@ -1,25 +1,25 @@ -// WebHelp 5.10.001 -var gTEA = new Array(); -function aTE(sTopicTitle, sTopicURL) -{ - var len = gTEA.length; - gTEA[len] = new topicEntry(sTopicTitle, sTopicURL); -} - -function topicEntry(sTopicTitle, sTopicURL) -{ - this.sTopicTitle = sTopicTitle; - this.sTopicURL = sTopicURL; -} - -function window_OnLoad() -{ - if (parent && parent != this) { - if (parent.putFtsTData) - { - parent.putFtsTData(gTEA); - } - } -} - +// WebHelp 5.10.001 +var gTEA = new Array(); +function aTE(sTopicTitle, sTopicURL) +{ + var len = gTEA.length; + gTEA[len] = new topicEntry(sTopicTitle, sTopicURL); +} + +function topicEntry(sTopicTitle, sTopicURL) +{ + this.sTopicTitle = sTopicTitle; + this.sTopicURL = sTopicURL; +} + +function window_OnLoad() +{ + if (parent && parent != this) { + if (parent.putFtsTData) + { + parent.putFtsTData(gTEA); + } + } +} + window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whdata/whftdata0.htm b/doc/salome/gui/GEOM/whdata/whftdata0.htm index 99cbf9136..08edd6a41 100755 --- a/doc/salome/gui/GEOM/whdata/whftdata0.htm +++ b/doc/salome/gui/GEOM/whdata/whftdata0.htm @@ -1,108 +1,101 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whdata/whfts.htm b/doc/salome/gui/GEOM/whdata/whfts.htm index 9dfa2144d..47b9c2613 100755 --- a/doc/salome/gui/GEOM/whdata/whfts.htm +++ b/doc/salome/gui/GEOM/whdata/whfts.htm @@ -1,18 +1,18 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whdata/whfts.js b/doc/salome/gui/GEOM/whdata/whfts.js index 2b6678690..54246f693 100755 --- a/doc/salome/gui/GEOM/whdata/whfts.js +++ b/doc/salome/gui/GEOM/whdata/whfts.js @@ -1,40 +1,40 @@ -// WebHelp 5.10.001 -var gaFileMapping = new Array(); -var gaFileTopicMapping = new Array(); - -function fileMapping(sStartKey, sEndKey, sFileName) -{ - this.sStartKey = sStartKey; - this.sEndKey = sEndKey; - this.sFileName = sFileName; - this.aFtsKeys = null; -} - -function fileTopicMapping(nIdBegin, nIdEnd, sFileName) -{ - this.nBegin = nIdBegin; - this.nEnd = nIdEnd; - this.sFileName = sFileName; - this.aTopics = null; -} - - -function iWM(sStartKey, sEndKey, sFileName) -{ - gaFileMapping[gaFileMapping.length] = new fileMapping(sStartKey, sEndKey, sFileName); -} - -function window_OnLoad() -{ - if (parent && parent != this && parent.ftsReady) - { - parent.ftsReady(gaFileMapping, gaFileTopicMapping); - } -} - -function iTM(nIdBegin, nIdEnd, sFileName) -{ - gaFileTopicMapping[gaFileTopicMapping.length] = new fileTopicMapping(nIdBegin, nIdEnd, sFileName); -} - -window.onload = window_OnLoad; +// WebHelp 5.10.001 +var gaFileMapping = new Array(); +var gaFileTopicMapping = new Array(); + +function fileMapping(sStartKey, sEndKey, sFileName) +{ + this.sStartKey = sStartKey; + this.sEndKey = sEndKey; + this.sFileName = sFileName; + this.aFtsKeys = null; +} + +function fileTopicMapping(nIdBegin, nIdEnd, sFileName) +{ + this.nBegin = nIdBegin; + this.nEnd = nIdEnd; + this.sFileName = sFileName; + this.aTopics = null; +} + + +function iWM(sStartKey, sEndKey, sFileName) +{ + gaFileMapping[gaFileMapping.length] = new fileMapping(sStartKey, sEndKey, sFileName); +} + +function window_OnLoad() +{ + if (parent && parent != this && parent.ftsReady) + { + parent.ftsReady(gaFileMapping, gaFileTopicMapping); + } +} + +function iTM(nIdBegin, nIdEnd, sFileName) +{ + gaFileTopicMapping[gaFileTopicMapping.length] = new fileTopicMapping(nIdBegin, nIdEnd, sFileName); +} + +window.onload = window_OnLoad; diff --git a/doc/salome/gui/GEOM/whdata/whfwdata.js b/doc/salome/gui/GEOM/whdata/whfwdata.js index e9e8bc6c1..8340b59d5 100755 --- a/doc/salome/gui/GEOM/whdata/whfwdata.js +++ b/doc/salome/gui/GEOM/whdata/whfwdata.js @@ -1,37 +1,37 @@ -// WebHelp 5.10.001 -var gWEA = new Array(); -function aWE() -{ - var len = gWEA.length; - gWEA[len] = new ftsEntry(aWE.arguments); -} - -function ftsEntry(fn_arguments) -{ - if (fn_arguments.length && fn_arguments.length >= 1) - { - this.sItemName = fn_arguments[0]; - this.aTopics = null; - var nLen = fn_arguments.length; - if (nLen > 1) - { - this.aTopics = new Array(); - for (var i = 0; i < nLen - 1; i ++ ) - { - this.aTopics[i] = fn_arguments[i + 1]; - } - } - } -} - -function window_OnLoad() -{ - if (parent && parent != this) { - if (parent.putFtsWData) - { - parent.putFtsWData(gWEA); - } - } -} - +// WebHelp 5.10.001 +var gWEA = new Array(); +function aWE() +{ + var len = gWEA.length; + gWEA[len] = new ftsEntry(aWE.arguments); +} + +function ftsEntry(fn_arguments) +{ + if (fn_arguments.length && fn_arguments.length >= 1) + { + this.sItemName = fn_arguments[0]; + this.aTopics = null; + var nLen = fn_arguments.length; + if (nLen > 1) + { + this.aTopics = new Array(); + for (var i = 0; i < nLen - 1; i ++ ) + { + this.aTopics[i] = fn_arguments[i + 1]; + } + } + } +} + +function window_OnLoad() +{ + if (parent && parent != this) { + if (parent.putFtsWData) + { + parent.putFtsWData(gWEA); + } + } +} + window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whdata/whfwdata0.htm b/doc/salome/gui/GEOM/whdata/whfwdata0.htm index f3f18a8fd..78d7054e2 100755 --- a/doc/salome/gui/GEOM/whdata/whfwdata0.htm +++ b/doc/salome/gui/GEOM/whdata/whfwdata0.htm @@ -1,1292 +1,1349 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whdata/whgdata.js b/doc/salome/gui/GEOM/whdata/whgdata.js index 77e0107f3..e38a107b5 100755 --- a/doc/salome/gui/GEOM/whdata/whgdata.js +++ b/doc/salome/gui/GEOM/whdata/whgdata.js @@ -1,26 +1,26 @@ -// WebHelp 5.10.001 -var gIEA = new Array(); -function aGE(sName, sDef) -{ - var len = gIEA.length; - gIEA[len] = new gloEntry(sName, sDef); -} - -function gloEntry(sName, sDef) -{ - this.sName = sName; - this.sDef = sDef; - this.nNKOff = 0; -} - -function window_OnLoad() -{ - if (parent && parent != this) { - if (parent.putData) - { - parent.putData(gIEA); - } - } -} - +// WebHelp 5.10.001 +var gIEA = new Array(); +function aGE(sName, sDef) +{ + var len = gIEA.length; + gIEA[len] = new gloEntry(sName, sDef); +} + +function gloEntry(sName, sDef) +{ + this.sName = sName; + this.sDef = sDef; + this.nNKOff = 0; +} + +function window_OnLoad() +{ + if (parent && parent != this) { + if (parent.putData) + { + parent.putData(gIEA); + } + } +} + window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whdata/whgdata0.htm b/doc/salome/gui/GEOM/whdata/whgdata0.htm index 9d256b1a8..3865725f4 100755 --- a/doc/salome/gui/GEOM/whdata/whgdata0.htm +++ b/doc/salome/gui/GEOM/whdata/whgdata0.htm @@ -1,33 +1,33 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whdata/whglo.htm b/doc/salome/gui/GEOM/whdata/whglo.htm index dc5a67786..9d7ac79f1 100755 --- a/doc/salome/gui/GEOM/whdata/whglo.htm +++ b/doc/salome/gui/GEOM/whdata/whglo.htm @@ -1,16 +1,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whdata/whglo.js b/doc/salome/gui/GEOM/whdata/whglo.js index e0519afcb..c34fb24b2 100755 --- a/doc/salome/gui/GEOM/whdata/whglo.js +++ b/doc/salome/gui/GEOM/whdata/whglo.js @@ -1,34 +1,34 @@ -// WebHelp 5.10.001 -var gaFileMapping = new Array(); -function fileMapping(sBK, sEK, sFileName, nNum) -{ - this.sBK = sBK; - this.sEK = sEK; - this.sFileName = sFileName; - this.aKs = null; - this.nNum = nNum; - this.oUsedItems = null; -} - - -function iFM(sBK, sEK, sFileName, nNum) -{ - var i = gaFileMapping.length; - gaFileMapping[i] = new fileMapping(sBK, sEK, sFileName, nNum); - if (i == 0) { - gaFileMapping[i].nTotal = nNum; - } - else { - gaFileMapping[i].nTotal = nNum + gaFileMapping[i - 1].nTotal; - } -} - -function window_OnLoad() -{ - if (parent && parent != this && parent.projReady) - { - parent.projReady(gaFileMapping); - } -} - -window.onload = window_OnLoad; +// WebHelp 5.10.001 +var gaFileMapping = new Array(); +function fileMapping(sBK, sEK, sFileName, nNum) +{ + this.sBK = sBK; + this.sEK = sEK; + this.sFileName = sFileName; + this.aKs = null; + this.nNum = nNum; + this.oUsedItems = null; +} + + +function iFM(sBK, sEK, sFileName, nNum) +{ + var i = gaFileMapping.length; + gaFileMapping[i] = new fileMapping(sBK, sEK, sFileName, nNum); + if (i == 0) { + gaFileMapping[i].nTotal = nNum; + } + else { + gaFileMapping[i].nTotal = nNum + gaFileMapping[i - 1].nTotal; + } +} + +function window_OnLoad() +{ + if (parent && parent != this && parent.projReady) + { + parent.projReady(gaFileMapping); + } +} + +window.onload = window_OnLoad; diff --git a/doc/salome/gui/GEOM/whdata/whidata.js b/doc/salome/gui/GEOM/whdata/whidata.js index 9f0eb15ed..a92184730 100755 --- a/doc/salome/gui/GEOM/whdata/whidata.js +++ b/doc/salome/gui/GEOM/whdata/whidata.js @@ -1,89 +1,89 @@ -// WebHelp 5.10.001 -// const strings -var gIEA = new Array(); -function aIE() -{ - var len = gIEA.length; - gIEA[len] = new indexEntry(aIE.arguments); -} - -function topic(sName, sURL) -{ - this.sName = sName; - this.sURL = sURL; -} - -function indexEntry(fn_arguments) -{ - if (fn_arguments.length && fn_arguments.length >= 3) - { - this.nType = fn_arguments[0]; - this.nPKOff = 0; - this.nNKOff = fn_arguments[1]; - this.sName = fn_arguments[2]; - this.aTopics = null; - var nLen = fn_arguments.length; - if (Math.floor(nLen / 2) * 2 == nLen) - { - this.sTarget = fn_arguments[3]; - if (nLen > 5) - { - this.aTopics = new Array(); - for (var i = 0; i < (nLen - 5)/2; i++) - { - this.aTopics[i] = new topic(fn_arguments[i * 2 + 4], fn_arguments[i * 2 + 5]); - } - } - - } - else - { - if (nLen > 4) - { - this.aTopics = new Array(); - for (var i = 0; i < (nLen - 4)/2; i++) - { - this.aTopics[i] = new topic(fn_arguments[i * 2 + 3], fn_arguments[i * 2 + 4]); - } - } - } - } -} - -function getIndexTopicMappingList(nItemIndex) -{ - var sTopics = ""; - if (gIEA.length > nItemIndex) - { - if (gIEA[nItemIndex].aTopics) - { - var i = 0; - var nLen = gIEA[nItemIndex].aTopics.length; - for (i = 0; i < nLen; i ++) - { - sTopics += "," + gIEA[nItemIndex].aTopics[i]; - } - } - } - return sTopics; -} - -function window_OnLoad() -{ - if (parent && parent != this) { - if (parent.putData) - { - for (var i = 0; i < gIEA.length; i ++ ) - { - if (gIEA[i].nNKOff != 0 && i + gIEA[i].nNKOff + 1 < gIEA.length) - { - - gIEA[i + gIEA[i].nNKOff + 1].nPKOff = gIEA[i].nNKOff; - } - } - parent.putData(gIEA); - } - } -} - +// WebHelp 5.10.001 +// const strings +var gIEA = new Array(); +function aIE() +{ + var len = gIEA.length; + gIEA[len] = new indexEntry(aIE.arguments); +} + +function topic(sName, sURL) +{ + this.sName = sName; + this.sURL = sURL; +} + +function indexEntry(fn_arguments) +{ + if (fn_arguments.length && fn_arguments.length >= 3) + { + this.nType = fn_arguments[0]; + this.nPKOff = 0; + this.nNKOff = fn_arguments[1]; + this.sName = fn_arguments[2]; + this.aTopics = null; + var nLen = fn_arguments.length; + if (Math.floor(nLen / 2) * 2 == nLen) + { + this.sTarget = fn_arguments[3]; + if (nLen > 5) + { + this.aTopics = new Array(); + for (var i = 0; i < (nLen - 5)/2; i++) + { + this.aTopics[i] = new topic(fn_arguments[i * 2 + 4], fn_arguments[i * 2 + 5]); + } + } + + } + else + { + if (nLen > 4) + { + this.aTopics = new Array(); + for (var i = 0; i < (nLen - 4)/2; i++) + { + this.aTopics[i] = new topic(fn_arguments[i * 2 + 3], fn_arguments[i * 2 + 4]); + } + } + } + } +} + +function getIndexTopicMappingList(nItemIndex) +{ + var sTopics = ""; + if (gIEA.length > nItemIndex) + { + if (gIEA[nItemIndex].aTopics) + { + var i = 0; + var nLen = gIEA[nItemIndex].aTopics.length; + for (i = 0; i < nLen; i ++) + { + sTopics += "," + gIEA[nItemIndex].aTopics[i]; + } + } + } + return sTopics; +} + +function window_OnLoad() +{ + if (parent && parent != this) { + if (parent.putData) + { + for (var i = 0; i < gIEA.length; i ++ ) + { + if (gIEA[i].nNKOff != 0 && i + gIEA[i].nNKOff + 1 < gIEA.length) + { + + gIEA[i + gIEA[i].nNKOff + 1].nPKOff = gIEA[i].nNKOff; + } + } + parent.putData(gIEA); + } + } +} + window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whdata/whidx.htm b/doc/salome/gui/GEOM/whdata/whidx.htm index 0a0deedd0..a049a96f9 100755 --- a/doc/salome/gui/GEOM/whdata/whidx.htm +++ b/doc/salome/gui/GEOM/whdata/whidx.htm @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whdata/whidx.js b/doc/salome/gui/GEOM/whdata/whidx.js index e0519afcb..c34fb24b2 100755 --- a/doc/salome/gui/GEOM/whdata/whidx.js +++ b/doc/salome/gui/GEOM/whdata/whidx.js @@ -1,34 +1,34 @@ -// WebHelp 5.10.001 -var gaFileMapping = new Array(); -function fileMapping(sBK, sEK, sFileName, nNum) -{ - this.sBK = sBK; - this.sEK = sEK; - this.sFileName = sFileName; - this.aKs = null; - this.nNum = nNum; - this.oUsedItems = null; -} - - -function iFM(sBK, sEK, sFileName, nNum) -{ - var i = gaFileMapping.length; - gaFileMapping[i] = new fileMapping(sBK, sEK, sFileName, nNum); - if (i == 0) { - gaFileMapping[i].nTotal = nNum; - } - else { - gaFileMapping[i].nTotal = nNum + gaFileMapping[i - 1].nTotal; - } -} - -function window_OnLoad() -{ - if (parent && parent != this && parent.projReady) - { - parent.projReady(gaFileMapping); - } -} - -window.onload = window_OnLoad; +// WebHelp 5.10.001 +var gaFileMapping = new Array(); +function fileMapping(sBK, sEK, sFileName, nNum) +{ + this.sBK = sBK; + this.sEK = sEK; + this.sFileName = sFileName; + this.aKs = null; + this.nNum = nNum; + this.oUsedItems = null; +} + + +function iFM(sBK, sEK, sFileName, nNum) +{ + var i = gaFileMapping.length; + gaFileMapping[i] = new fileMapping(sBK, sEK, sFileName, nNum); + if (i == 0) { + gaFileMapping[i].nTotal = nNum; + } + else { + gaFileMapping[i].nTotal = nNum + gaFileMapping[i - 1].nTotal; + } +} + +function window_OnLoad() +{ + if (parent && parent != this && parent.projReady) + { + parent.projReady(gaFileMapping); + } +} + +window.onload = window_OnLoad; diff --git a/doc/salome/gui/GEOM/whdata/whtdata.js b/doc/salome/gui/GEOM/whdata/whtdata.js index d5428a7de..0558e198c 100755 --- a/doc/salome/gui/GEOM/whdata/whtdata.js +++ b/doc/salome/gui/GEOM/whdata/whtdata.js @@ -1,64 +1,64 @@ -// WebHelp 5.10.001 -var gTEA = new Array(); -function aTE() -{ - gTEA[gTEA.length] = new tocEntry(aTE.arguments); -} - -function tocEntry(fn_arguments) -{ - if (fn_arguments.length < 3) - { - alert ("data format wrong!!!"); - return; - } - - this.nType = fn_arguments[0]; - this.nContents = fn_arguments[1]; - this.sItemName = fn_arguments[2]; - - if (this.nType == 1 || this.nType == 2 || this.nType == 16) - { - if (fn_arguments.length > 3) - { - this.sItemURL = fn_arguments[3]; - if (fn_arguments.length > 4) - { - this.sTarget = fn_arguments[4]; - if (fn_arguments.length > 5) - this.sIconRef = fn_arguments[5]; - } - } - } - if (this.nType == 4 || this.nType == 8) - { - if (fn_arguments.length > 3) - { - this.sRefURL = fn_arguments[3]; - if (this.nType == 4) - { - if(this.sRefURL.lastIndexOf("/")!=this.sRefURL.length-1) - this.sRefURL+="/"; - } - if (fn_arguments.length > 4) - { - this.sItemURL = fn_arguments[4]; - if (fn_arguments.length > 5) - { - this.sTarget = fn_arguments[5]; - if (fn_arguments.length > 6) - this.sIconRef = fn_arguments[6]; - } - } - } - } -} - - -function window_OnLoad() -{ - if (parent && parent != this && parent.putData) { - parent.putData(gTEA); - } -} +// WebHelp 5.10.001 +var gTEA = new Array(); +function aTE() +{ + gTEA[gTEA.length] = new tocEntry(aTE.arguments); +} + +function tocEntry(fn_arguments) +{ + if (fn_arguments.length < 3) + { + alert ("data format wrong!!!"); + return; + } + + this.nType = fn_arguments[0]; + this.nContents = fn_arguments[1]; + this.sItemName = fn_arguments[2]; + + if (this.nType == 1 || this.nType == 2 || this.nType == 16) + { + if (fn_arguments.length > 3) + { + this.sItemURL = fn_arguments[3]; + if (fn_arguments.length > 4) + { + this.sTarget = fn_arguments[4]; + if (fn_arguments.length > 5) + this.sIconRef = fn_arguments[5]; + } + } + } + if (this.nType == 4 || this.nType == 8) + { + if (fn_arguments.length > 3) + { + this.sRefURL = fn_arguments[3]; + if (this.nType == 4) + { + if(this.sRefURL.lastIndexOf("/")!=this.sRefURL.length-1) + this.sRefURL+="/"; + } + if (fn_arguments.length > 4) + { + this.sItemURL = fn_arguments[4]; + if (fn_arguments.length > 5) + { + this.sTarget = fn_arguments[5]; + if (fn_arguments.length > 6) + this.sIconRef = fn_arguments[6]; + } + } + } + } +} + + +function window_OnLoad() +{ + if (parent && parent != this && parent.putData) { + parent.putData(gTEA); + } +} window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whdata/whtdata0.htm b/doc/salome/gui/GEOM/whdata/whtdata0.htm index ff33c3846..58b23cebb 100755 --- a/doc/salome/gui/GEOM/whdata/whtdata0.htm +++ b/doc/salome/gui/GEOM/whdata/whtdata0.htm @@ -1,113 +1,114 @@ - - - - - - - - - - - + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whdata/whtoc.htm b/doc/salome/gui/GEOM/whdata/whtoc.htm index 54e0cbf26..459c3e311 100755 --- a/doc/salome/gui/GEOM/whdata/whtoc.htm +++ b/doc/salome/gui/GEOM/whdata/whtoc.htm @@ -1,16 +1,16 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whdata/whtoc.js b/doc/salome/gui/GEOM/whdata/whtoc.js index 163d8cc9f..62de5a132 100755 --- a/doc/salome/gui/GEOM/whdata/whtoc.js +++ b/doc/salome/gui/GEOM/whdata/whtoc.js @@ -1,31 +1,31 @@ -// WebHelp 5.10.001 -// const strings -var gaProj = new Array(); -var gsRoot = ""; - -function setRoot(sRoot) -{ - gsRoot = sRoot -} - -function aPE(sProjPath, sRootPath) -{ - gaProj[gaProj.length] = new tocProjEntry(sProjPath, sRootPath); -} - -function tocProjEntry(sProjPath, sRootPath) -{ - if(sProjPath.lastIndexOf("/")!=sProjPath.length-1) - sProjPath+="/"; - this.sPPath = sProjPath; - this.sRPath = sRootPath; -} - - -function window_OnLoad() -{ - if (parent && parent != this && parent.projReady) { - parent.projReady(gsRoot, gaProj); - } -} +// WebHelp 5.10.001 +// const strings +var gaProj = new Array(); +var gsRoot = ""; + +function setRoot(sRoot) +{ + gsRoot = sRoot +} + +function aPE(sProjPath, sRootPath) +{ + gaProj[gaProj.length] = new tocProjEntry(sProjPath, sRootPath); +} + +function tocProjEntry(sProjPath, sRootPath) +{ + if(sProjPath.lastIndexOf("/")!=sProjPath.length-1) + sProjPath+="/"; + this.sPPath = sProjPath; + this.sRPath = sRootPath; +} + + +function window_OnLoad() +{ + if (parent && parent != this && parent.projReady) { + parent.projReady(gsRoot, gaProj); + } +} window.onload = window_OnLoad; \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whgdata/whlstf0.htm b/doc/salome/gui/GEOM/whgdata/whlstf0.htm index 0b69fb423..cda409010 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf0.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf0.htm @@ -1,46 +1,46 @@ - - -Search Words List - - - - - - - -

- - -100x30x100
1d 1 2 3 4
1e 1 2
1st 1 2 3 4 5
2d 1 2 3 4 5 6 7 8 9 10 11
2nd 1 2 3 4 5
2st
3d 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
3rd 1 2
3st
-

-able
above
absolute
absolutely
accessible 1 2 3 4 5 6 7
accordance 1 2 3
according 1 2 3 4
achieve 1 2
add 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
added 1 2 3
adding 1 2
addobject 1 2
addtostudy 1 2 3 4 5 6 7 8 9 10 11 12 13
addtostudyinfather 1 2
adjustment
advance 1 2 3
advanced 1 2 3 4 5 6 7 8 9
aimed
algorithm 1 2 3 4 5
algorithms 1 2 3 4 5 6 7 8 9 10 11 12
all_faces
allowing
allows 1 2 3 4 5 6 7 8 9 10 11 12 13
along 1 2 3 4 5 6 7 8 9 10
alongside
already
angle 1 2 3 4 5 6 7 8 9 10
another 1 2 3 4 5 6
any 1 2 3 4 5 6 7
appear
append 1 2
applicable 1 2
applied 1 2
apply 1 2 3 4 5
applying 1 2
approximation 1 2
arc 1 2 3 4 5 6 7 8 9
arc1
arc2
archimede 1 2 3
arcs 1 2
area
argument 1 2 3
arguments 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
around 1 2 3 4
associated
attributes
automatically 1 2 3
available 1 2 3 4 5 6 7 8 9 10 11
axes 1 2 3 4
axis 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
-

-b 1 2 3
base 1 2 3 4 5 6 7 8 9 10
based 1 2
baseshape 1 2
basic 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
basicproperties 1 2
basing 1 2 3
basis 1 2


>> - - - - - + + +Search Words List + + + + + + + +

+ + +100x30x100
1d 1 2
1e 1 2
2d 1 2 3 4 5 6
3d 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
+

+able 1 2
absolute
absolutely
access
accessed
accessible 1 2 3 4 5 6
accordance 1 2
according
add 1 2 3 4 5 6 7 8 9 10 11 12 13 14
added 1 2
adding 1 2
addobject 1 2
addtostudy 1 2 3 4 5 6 7 8 9 10 11 12 13
addtostudyinfather 1 2
advance 1 2 3
advanced 1 2 3 4 5 6 7
algorithm 1 2 3 4
algorithms 1 2 3 4 5 6 7 8 9 10 11 12
all_faces
allow
allows 1 2 3 4 5 6 7 8 9 10 11 12 13 14
along 1 2 3 4 5 6 7 8
alongside
already
although
angle 1 2 3 4 5 6 7
another 1 2 3 4 5 6
any 1 2 3 4 5
appear
appeared
append 1 2
applicable
applied 1 2
apply 1 2 3
applying 1 2
approximation
arc 1 2 3 4 5 6 7 8
arc1
arc2
archimede 1 2
arcs 1 2
area 1 2
argument 1 2 3
arguments 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
around 1 2 3
automatically 1 2 3
available 1 2 3 4 5 6 7 8 9 10
axes 1 2 3 4
axis 1 2 3 4 5 6 7 8 9 10 11 12
+

+b 1 2 3
background
base 1 2 3 4 5 6 7 8 9
based
baseshape
basic 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
basicproperties 1 2
basing 1 2
basis 1 2
bb
before 1 2 3
beginning
being
belongs
below
besier
bezier 1 2 3
black
block 1 2 3 4 5
blocks 1 2 3 4 5 6 7 8 9 10
bmp 1 2
boolean 1 2 3 4 5 6 7 8 9
both 1 2 3 4
boudaries
boundaries 1 2 3 4
boundary 1 2 3
bounded 1 2
bounding 1 2
boundingbox 1 2
box 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
box_tr1
box_tr2
box1 1 2 3
box2 1 2 3
box3
boxes 1 2 3


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf1.htm b/doc/salome/gui/GEOM/whgdata/whlstf1.htm index 7d9153cc5..a8e27edb7 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf1.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf1.htm @@ -1,43 +1,43 @@ - - -Search Words List - - - - - - - -

<<

-

-bb
before 1 2 3 4
beginning
being
belongs
below 1 2
besier
bezier 1 2 3 4 5
big
block 1 2 3 4 5 6
blocks 1 2 3 4 5 6 7 8 9 10 11
boolean 1 2 3 4 5 6 7 8 9
both 1 2 3 4
boudaries
boundaries 1 2 3 4 5
boundary 1 2 3 4
bounded 1 2
bounding 1 2
boundingbox 1 2
box 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32
box_tr1
box_tr2
box1 1 2 3
box2 1 2 3
box3
boxes 1 2 3
breaks 1 2
brep 1 2 3
browser 1 2 3 4 5 6
bspline 1 2
bsplinerestriction 1 2
bsplines 1 2
build 1 2 3 4 5 6 7 8 9 10 11
building 1 2 3 4 5
builds 1 2 3 4
button 1 2 3 4 5 6 7
bypassing
-

-c 1 2
cad
camera 1 2
case 1 2 3 4 5 6
cases
catia
center 1 2 3 4 5 6 7 8 9 10 11 12 13 14
centerofscale 1 2
centers
central 1 2 3 4
certain
chain
chamfer 1 2 3
chamfer_all
chamfer_e
chamfer_f
chamfer_f1
change 1 2 3 4 5
changing 1 2 3 4 5
check 1 2 3 4 5 6 7 8
check_box
checkandimprove
checkbox 1 2 3 4 5 6 7 8
checkcompoundofblocks 1 2
checked 1 2 3 4 5
checking 1 2 3 4 5
checks
checkshape 1 2 3
choices
choose 1 2 3 4 5
circle 1 2 3
circle1
circle2
circles 1 2
click 1 2 3 4 5
clicking 1 2
close 1 2 3 4
closecontour 1 2 3
closed 1 2 3 4 5 6
closedwires 1 2 3
closes 1 2 3
closure 1 2
cm
coincident 1 2
coincides
collinear 1 2
color 1 2 3 4
command 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
commands 1 2 3 4 5 6 7 8 9
common 1 2 3 4 5 6 7
complex 1 2 3 4 5 6 7 8 9
components 1 2 3 4 5 6 7
composed
composing
compound 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
compsolid 1 2 3 4
compsolids
compute 1 2
computed
concerning
conditions
cone 1 2 3 4
cone1
cone2
cones
confirm 1 2
conical 1 2
connected 1 2 3 4 5 6 7
connection
consequently
considered 1 2 3 4
console
constraints
construct
constructed 1 2 3
constructing
construction 1 2 3 4
constructor 1 2 3 4 5
contain 1 2
contained 1 2 3
contains 1 2 3
contents 1 2
continuities 1 2
continuity 1 2
continuity2d 1 2
continuity3d 1 2
contour 1 2 3
conversion 1 2
coordinate 1 2 3 4 5 6 7 8 9 10 11
coordinates 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
coords
copy 1 2 3 4 5
corners 1 2 3
correction 1 2
correspond 1 2 3
corresponding 1 2 3 4
correspondingly 1 2 3 4 5 6 7
count
coupled
covering


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+brackets
breaks
brep 1 2 3 4
browser 1 2 3 4
bspline
bsplinerestriction
bsplines
build 1 2 3 4 5 6 7 8 9
building 1 2 3 4
builds 1 2 3
button 1 2 3 4 5 6
buttons
bypassing
+

+c 1 2 3
c0
c1
c2
cad 1 2
camera
cascade
case 1 2 3
cases
catia
center 1 2 3 4 5 6 7 8 9 10 11 12
centerofscale
centers
central 1 2 3 4
certain 1 2
chain
chamfer 1 2
chamfer_all
chamfer_e
chamfer_f
chamfer_f1
change 1 2 3 4 5
changes
changing 1 2 3 4
check 1 2 3 4 5 6 7
check_box
checkandimprove
checkbox 1 2 3 4 5 6
checkcompoundofblocks 1 2
checked 1 2 3 4 5
checking 1 2 3
checks
checkshape 1 2 3
choices
choose 1 2 3
circle 1 2
circle1
circle2
circles 1 2
click 1 2 3 4 5
clicking 1 2 3
clipping
clone
close 1 2 3
closecontour 1 2
closed 1 2 3 4
closedwires 1 2
closes 1 2
closure
cm
cn
coincide
coincident
coincidental
coincides
collinear 1 2
color 1 2 3 4
command 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
commands 1 2 3 4 5 6 7 8 9
common 1 2 3 4 5 6
complex 1 2 3 4 5 6 7 8
components 1 2 3 4 5
composed
composing
compound 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
compsolid 1 2 3
compsolids
compute
computed
concerning
conditions
cone 1 2 3
cone1
cone2
cones
confirm 1 2
conical
connected 1 2 3 4 5
connection
consequently
considered 1 2 3
console
constraints
constructed 1 2
construction 1 2 3 4 5 6
contain
contained
containing
contains 1 2
contents 1 2 3
continuities
continuity
continuity2d
continuity3d
continuous
contour 1 2
conversion
converts
coordinate 1 2 3 4 5 6 7 8 9 10
coordinates 1 2 3 4 5 6 7 8 9 10 11 12 13 14
coords
copy 1 2 3 4
corner
corners 1 2
correction
corrects
correspond 1 2
corresponding 1 2
correspondingly 1 2
count
coupled
covering


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf10.htm b/doc/salome/gui/GEOM/whgdata/whlstf10.htm index b63ce834b..537af78aa 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf10.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf10.htm @@ -1,41 +1,43 @@ - - -Search Words List - - - - - - - -

<<

-

-parallel 1 2 3
parameter 1 2 3 4 5 6 7
parameters 1 2 3 4 5 6 7 8 9 10 11 12 13
paramter 1 2
part 1 2 3
partition 1 2 3
partition1
partition2
partition3
passed
passes 1 2 3 4 5
passing
path 1 2 3
pathshape 1 2
pattern
perform 1 2 3 4
performed 1 2
perpendicular
pi 1 2 3
picture
pipe 1 2 3
place
places
planar 1 2 3 4 5 6 7
plane 1 2 3 4 5 6 7 8 9 10 11 12
plane1
plane2
plane3
planes 1 2
platform
plug
plunged 1 2
point 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
point1 1 2 3 4 5 6 7 8 9 10 11 12
point2 1 2 3 4 5 6 7 8 9 10 11 12
point3 1 2 3 4 5 6
point4 1 2
point5
pointcoordinates 1 2
points 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
polyline 1 2 3
pop 1 2 3 4
position 1 2 3 4 5 6
possibilities
possibility 1 2
possible 1 2 3 4 5 6 7 8
precision 1 2 3
predefined
press
presses
presumes
preview
previous
primitive
primitives 1 2 3 4 5 6 7 8
print 1 2
printed
prism 1 2 3 4 5 6
prism_edges
prism_faces 1 2
prism1
prism2
prisms 1 2
problems 1 2
process
processed 1 2 3 4 5 6
processes 1 2
processing 1 2 3
processshape 1 2 3
produce 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
program
projection
projections
propagate 1 2 3
propagation 1 2 3
properties 1 2 3
props
provide 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
ps
put 1 2
px 1 2 3 4 5
pxy
pxyz 1 2 3


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+right 1 2 3 4
rise
rot1d
rot2d
rotate 1 2 3
rotated 1 2 3
rotates 1 2
rotation 1 2 3 4 5
ruling
runtimeerror 1 2
+

+s 1 2 3 4 5 6 7 8 9 10 11
s1 1 2 3
s2 1 2 3
salome 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
same 1 2 3 4 5
sameparameter
satisfy
save
saved
saves
scale 1 2
scaled
scene
scripts 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
search
second 1 2 3 4 5 6 7 8
secondly 1 2 3 4 5 6 7 8 9 10 11 12 13
section 1 2 3 4 5
see 1 2 3
seems
segment
segments 1 2
select 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
selected 1 2 3 4 5 6 7 8 9 10
selecting 1 2 3
selection 1 2 3 4
sense
separate
serve
serving 1 2 3
set 1 2 3 4 5 6
setcolor 1 2
setdisplaymode 1 2 3 4 5 6 7 8 9 10 11 12 13
setting 1 2 3
settransparency 1 2 3 4 5
sew
sewed
sewing 1 2
sg 1 2 3 4
shading 1 2
shape 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38
shape1 1 2
shape2 1 2
shapelistcompound
shapes 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
shapes_of_given_type
shapetype 1 2 3 4 5 6
shapetypeedge
shapetypeface
shared
sharp
shell 1 2 3 4 5 6 7 8
shells 1 2 3 4 5 6 7
shift 1 2 3
shifted
short 1 2
shortcut
should 1 2 3 4 5
show 1 2
shown
shows


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf11.htm b/doc/salome/gui/GEOM/whgdata/whlstf11.htm index 1bd733ccc..e03381b30 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf11.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf11.htm @@ -1,47 +1,43 @@ - - -Search Words List - - - - - - - -

<<

-

-py 1 2 3 4 5
py1
python
pz 1 2 3 4 5 6
-

-qface1
qface2
qface3
qface4
qface5
qface6
qface7
qface8
quadrangle 1 2 3 4 5
-

-r 1 2 3
radians 1 2
radio
radius 1 2 3 4 5 6 7 8 9 10 11 12 13 14
radius1 1 2 3 4 5 6
radius2 1 2 3
radius3
radiuses 1 2 3 4 5 6
radiusmajor 1 2 3 4
radiusminor 1 2 3 4
raise 1 2 3
range 1 2 3 4 5 6
re 1 2
reasonable
reconstruction 1 2
reference 1 2 3
regarding 1 2
relative
relatively
relevant 1 2
remain
remove 1 2 3 4 5 6
removed 1 2 3 4 5 6 7 8 9 10 11
removeobject 1 2
removes 1 2 3
removewebs 1 2
removing 1 2 3
repair 1 2 3 4 5 6 7 8 9 10 11
repairing 1 2 3 4 5 6 7 8 9 10 11 12 13
repetition 1 2 3
repetitions 1 2
representing 1 2
requested
required 1 2 3 4
requireddegree 1 2
requirednbsegments 1 2
res
respect 1 2 3
restriction 1 2
result 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
resultant 1 2
resulting 1 2 3 4 5 6 7
results 1 2 3 4 5 6
retrieved
retrieves 1 2
return
returned 1 2 3
returning
returns 1 2 3 4 5 6 7 8
reverse 1 2 3
revolution 1 2 3 4 5
right 1 2 3 4 5
rot1d
rot2d
rotate 1 2 3
rotated 1 2 3 4 5
rotates 1 2 3
rotation 1 2 3 4 5
runtimeerror 1 2
-

-s 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
s1 1 2 3
s2 1 2 3
salome 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
same 1 2 3 4 5 6
sameparameter 1 2
satisfy
save
scale 1 2 3
scaled 1 2
scripts 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+side
signed
similar
simple 1 2 3
simply
single
six 1 2
size 1 2 3
sketch
sketcher 1 2 3
sketcher1 1 2
sketcher2 1 2
sketcher3
sketchers
skip
small 1 2
so 1 2
solid 1 2 3 4 5 6 7 8 9 10 11 12 13 14
solid1
solid2
solids 1 2 3
sorted
sorts
source
space 1 2 3 4 5 6
specific
specified 1 2 3 4 5 6 7 8 9 10 11
specify
specifying
sphere 1 2 3 4 5 6
sphere1
sphere2
sphere3
spheres
spline 1 2
split
splitangle
splitclosedfaces
splitcontinuity
splits 1 2
splitting
spots
sqrt
stage
standard 1 2
start 1 2 3 4
started
starting 1 2 3
step 1 2 3 4 5
step1
step2
still
strictly
string
strips
study 1 2 3 4 5 6 7 8 9 10 11
sub 1 2 3 4 5
sub_shape_id
subfacelist
submenu
subshape 1 2
subshapeall
subshapeallids
subshapeallsorted 1 2 3 4 5
subshapeallsortedids
subshapeid
subshapes 1 2
subshapesorted
subtraction
successfully
sup_faces
suppress 1 2 3 4
suppresses
suppressfaces 1 2
suppressholes 1 2
suppressinternalwires 1 2
surface 1 2 3 4 5 6 7
surfacecontinuity
surfacemode
surfaces
symmetric
symmetrical 1 2
symmetry
system 1 2 3 4 5 6 7
systems 1 2
+

+t 1 2 3 4 5
take
tangent
tangential
tangents
target 1 2
technology
tetrahedral
textual 1 2
th
theendlcs
them 1 2 3 4 5 6 7
theobject
therefore
theshape 1 2
thestartlcs
thetolerance
third
three 1 2 3 4 5 6 7 8 9 10 11 12 13
thus 1 2
time 1 2
times 1 2 3
tobezier
together
tol2d 1 2
tol3d 1 2
toler
tolerance 1 2 3 4 5 6 7
tolerance2d
tolerance3d 1 2
tolerances
tool
toolbar
tools 1 2
top_face
top_face_ind
torus 1 2
torus1
torus2
toruses
tr1d
tr2d
transform 1 2
transformate
transformation 1 2 3 4 5 6 7 8 9 10 11 12 13 14
transformations 1 2 3
transformed 1 2
transforms
translate 1 2
translated 1 2 3
translates 1 2
translation 1 2 3 4
translation1
translation2
translation3
translations 1 2 3
transparency 1 2 3
transparent 1 2
triangles
trihedron
trimsize 1 2 3
true 1 2 3 4 5
truncated
try


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf12.htm b/doc/salome/gui/GEOM/whgdata/whlstf12.htm index 52a23fe67..18c099123 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf12.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf12.htm @@ -1,41 +1,47 @@ - - -Search Words List - - - - - - - -

<<

-

-search
second 1 2 3 4 5 6 7 8 9 10
secondly 1 2 3 4 5 6 7 8 9 10 11 12 13
section 1 2 3 4 5
see
seems
segment
segments 1 2 3
select 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70
selected 1 2 3 4 5 6 7 8 9 10 11 12
selecting 1 2
selection 1 2 3 4 5 6
sense 1 2
separate
serve 1 2
serving 1 2 3 4
set 1 2 3 4 5 6 7 8 9
setcolor 1 2 3
setdisplaymode 1 2 3 4 5 6 7 8 9 10 11 12 13 14
sets
setting 1 2 3 4 5
settransparency 1 2 3 4 5 6
sew 1 2
sewed 1 2
sewing 1 2 3
sg 1 2 3 4
shading 1 2
shape 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
shape1 1 2
shape2 1 2
shapelistcompound
shapes 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
shapes_of_given_type
shapesto
shapetype 1 2 3 4 5 6 7
shapetypeedge
shapetypeface
shared 1 2
shell 1 2 3 4 5 6 7 8 9 10 11
shells 1 2 3 4 5 6 7 8 9 10
shift 1 2 3
short 1 2 3
shortcut
should 1 2 3 4 5 6
show
shown 1 2
side 1 2
signed 1 2
similar
simple 1 2 3
simply
single
six 1 2
size 1 2 3 4 5 6
sketch
sketcher 1 2 3
sketcher1 1 2
sketcher2 1 2
sketcher3
sketchers
skip
small 1 2 3
so 1 2
solid 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
solid1
solid2
solids 1 2 3 4
soon
sorted
sorts
source


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+tt 1 2
tui 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63
tuple
two 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
type 1 2 3 4 5 6 7 8
types 1 2
+

+u
underlying 1 2
unionlist
up 1 2
update
updateobjbrowser 1 2 3
upper
used 1 2
useful 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
user 1 2 3 4
using 1 2 3 4 5 6 7 8 9 10 11 12 13
+

+v 1 2 3 4
v1
v2
v3
v4
val
valid 1 2 3
validity
value 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
values 1 2 3 4 5 6 7 8 9 10 11 12 13 14
variety
various
vector 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
vector_arc 1 2
vector1 1 2
vector1_arc1
vector1_arc2
vector2 1 2
vector2_arc1
vector2_arc2
vector3
vectors 1 2 3 4 5 6 7
versa
vertex 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
vertex_n
vertex1
vertex2
vertexmaxtol
vertexmintol
vertices 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
via 1 2 3 4 5 6 7 8 9
vice
view 1 2
viewer 1 2 3 4 5 6 7 8 9 10 11 12 13 14
viewing 1 2 3
views
visible
visualize
volume 1 2
vr
vrot1d
vt
vtr1d
vtr2d
vxy 1 2 3 4 5
vxyz
vz
+

+w_0


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf13.htm b/doc/salome/gui/GEOM/whgdata/whlstf13.htm index acbd3b307..355c2d788 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf13.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf13.htm @@ -1,43 +1,46 @@ - - -Search Words List - - - - - - - -

<<

-

-space 1 2 3 4 5 6 7
specific
specified 1 2 3 4 5 6 7 8 9 10 11 12 13 14
specifies
specify 1 2
specifying 1 2
sphere 1 2 3 4 5 6 7
sphere1
sphere2
sphere3
spheres
spline 1 2 3
splitangle 1 2
splitclosedfaces 1 2
splitcontinuity 1 2
splits 1 2
splitting 1 2
spot 1 2
sqrt
stage
standard
start 1 2 3 4
started
starting 1 2 3 4 5
step 1 2 3 4 5
step1 1 2
step2 1 2
string
strip 1 2
study 1 2 3 4 5 6 7 8 9 10 11 12
sub 1 2 3 4 5 6
sub_shape_id
subfacelist
submenu 1 2 3 4
subshape 1 2 3 4
subshapeall 1 2
subshapeallids
subshapeallsorted 1 2 3 4 5
subshapeallsortedids
subshapeid
subshapes 1 2 3
subshapesorted
successfully
sup_faces
suppress 1 2 3 4 5
suppresses 1 2
suppressfaces 1 2 3
suppressholes 1 2 3
suppressinternalwires 1 2 3
surface 1 2 3 4 5 6 7
surfacecontinuity 1 2
surfacemode 1 2
surfaces 1 2
symmetric
symmetrical 1 2 3
symmetry 1 2 3
system 1 2 3 4 5 6 7 8 9
systems 1 2
-

-t 1 2 3 4
tangent
target 1 2 3
tetrahedral
textual 1 2
theendlcs 1 2
them 1 2 3 4 5 6 7
theobject 1 2
therefore
theshape 1 2 3
thestartlcs 1 2
thetolerance 1 2
third
three 1 2 3 4 5 6 7 8 9 10 11 12 13
thus
time 1 2
times 1 2 3 4
tobezier 1 2
together
tol2d 1 2 3
tol3d 1 2 3
toler
tolerance 1 2 3 4 5 6 7 8 9
tolerance2d 1 2
tolerance3d 1 2 3
tolerances
tool
tools 1 2
top_face
top_face_ind
torus 1 2 3
torus1
torus2
toruses
tr1d
tr2d
transform 1 2 3
transformate
transformation 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
transformations 1 2 3
transformed 1 2 3
transforms
translate 1 2
translated 1 2 3
translates 1 2
translation 1 2 3 4 5 6
translation1
translation2
translation3
translations 1 2 3 4 5
transparency 1 2 3
transparent 1 2
trihedron
trimsize 1 2 3 4
true 1 2 3 4 5 6 7
truncated
try


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+wantplanarface
water
waterdensity 1 2
way 1 2 3 4 5 6
ways 1 2 3
weight 1 2
well
wf
what
whatis 1 2
whether
while 1 2 3 4 5
whose 1 2
wide 1 2
will 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
wire 1 2 3 4 5 6 7 8 9 10 11 12 13 14
wire_close
wire_name
wire1
wire2
wireframe 1 2
wires 1 2 3 4 5 6 7 8 9 10 11 12
wish 1 2 3
within 1 2 3
without
work 1 2
working 1 2 3 4 5
workingplane
works
ww 1 2
+

+x 1 2 3 4 5 6 7 8 9
x1
x2
xdx
xdy
xdz
xmax 1 2
xmin 1 2
xoy
xyz
xz_face
xz_face_ind
+

+y 1 2 3 4 5 6 7 8
y1
y2
ydx
ydy
ydz
ymax 1 2
ymin 1 2
your 1 2 3 4 5 6 7 8 9
yourselves
yz_face
yz_face_ind
+

+z 1 2 3 4 5 6 7
z1
z2
zero
zmax 1 2
zmin 1 2
zoom


+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf14.htm b/doc/salome/gui/GEOM/whgdata/whlstf14.htm deleted file mode 100755 index 42f369d95..000000000 --- a/doc/salome/gui/GEOM/whgdata/whlstf14.htm +++ /dev/null @@ -1,45 +0,0 @@ - - -Search Words List - - - - - - - -

<<

-

-tt 1 2
tui 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
tuple
two 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32
type 1 2 3 4 5 6 7 8 9
typeofshape
types 1 2 3 4 5
-

-underlying 1 2
unionlist
up 1 2 3 4 5
updated
updateobjbrowser 1 2 3
upper 1 2
used 1 2 3 4
useful 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
user 1 2 3 4 5 6 7
using 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
-

-v 1 2 3 4
v1
v2
v3
v4
val 1 2
valid 1 2 3
validity
value 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
values 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
variety
various 1 2
vector 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
vector_arc 1 2
vector1 1 2
vector1_arc1
vector1_arc2
vector2 1 2
vector2_arc1
vector2_arc2
vector3
vectors 1 2 3 4 5 6 7 8
vertex 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
vertex_n
vertex1 1 2
vertex2 1 2
vertexmaxtol
vertexmintol
vertices 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24
via 1 2 3 4 5 6 7 8 9
view
viewer 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
viewers
viewing 1 2
visibility
visualization 1 2


>> - - - - - diff --git a/doc/salome/gui/GEOM/whgdata/whlstf15.htm b/doc/salome/gui/GEOM/whgdata/whlstf15.htm deleted file mode 100755 index cb9dad7c9..000000000 --- a/doc/salome/gui/GEOM/whgdata/whlstf15.htm +++ /dev/null @@ -1,48 +0,0 @@ - - -Search Words List - - - - - - - -

<<

-

-volume 1 2
vr
vrot1d
vt
vtk
vtr1d
vtr2d
vxy 1 2 3 4 5
vxyz
vz
-

-w_0
wantplanarface 1 2
water 1 2
waterdensity 1 2 3
way 1 2 3 4 5 6
ways 1 2 3
weight 1 2 3
wf
what
whatis 1 2
whether
while 1 2 3 4 5
whose 1 2 3
wide
will 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
wire 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
wire_close
wire_name
wire1
wire2
wireframe 1 2
wires 1 2 3 4 5 6 7 8 9 10 11 12 13 14
wish 1 2
within 1 2 3
without
work 1 2 3
working 1 2 3 4 5
workingplane
works
ww 1 2
-

-x 1 2 3 4 5 6 7 8 9
x1 1 2
x2 1 2
xdx 1 2
xdy 1 2
xdz 1 2
xmax 1 2
xmin 1 2
xoy
xyz 1 2
xz_face
xz_face_ind
-

-y 1 2 3 4 5 6 7 8 9
y1 1 2
y2 1 2
ydx 1 2
ydy 1 2
ydz 1 2
ymax 1 2
ymin 1 2
your 1 2 3 4 5 6 7 8 9
yourselves
yz_face
yz_face_ind
-

-z 1 2 3 4 5 6 7 8 9
z1 1 2
z2 1 2
zero
zmax 1 2
zmin 1 2


- - - - diff --git a/doc/salome/gui/GEOM/whgdata/whlstf2.htm b/doc/salome/gui/GEOM/whgdata/whlstf2.htm index 55ee7c6dd..66be35686 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf2.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf2.htm @@ -1,43 +1,43 @@ - - -Search Words List - - - - - - - -

<<

-

-create 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
createanddisplaygo 1 2 3 4 5 6 7 8 9 10 11 12 13
created 1 2 3 4 5 6 7 8 9 10 11
creategroup 1 2
creates 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
creating
creation 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
cs
cs1
cs2
cube
current 1 2
currently 1 2 3 4
curve 1 2 3 4 5 6
curve2dmode 1 2
curve3dmode 1 2
curvecontinuity 1 2
curves 1 2 3 4 5 6 7
curving 1 2
cut 1 2 3 4
cut_without_f_2
cuts 1 2
cutting 1 2 3 4
cylinder 1 2 3 4 5 6 7
cylinders
cylindrical 1 2
-

-d 1 2
d1 1 2 3
d2 1 2 3
data
data_dir
default 1 2 3
define 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
defined 1 2
defines 1 2 3
defining 1 2 3 4 5 6 7
definite 1 2 3
definition 1 2 3 4
deflection 1 2
degenerated
degree 1 2 3 4
degrees 1 2
delete
deleted 1 2
density 1 2
depending 1 2
descr
description 1 2 3 4 5 6 7 8 9 10 11 12 13 14
designed
desired 1 2
destination
destined
detect 1 2 3
detection 1 2
detects 1 2
diagonal
dialog 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
differ
differencelist
different 1 2 3 4 5
dimension 1 2 3 4 5
dimensions 1 2 3 4 5 6
dimentions
dir 1 2 3
dir1 1 2
dir2 1 2
direction 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
directions 1 2 3 4 5
dirface1v 1 2
dirfaceid1 1 2
dirfaceid1u 1 2
dirfaceid1v 1 2
dirfaceid2 1 2
dirfaceid2u 1 2
dirfaceid2v 1 2
display 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
displayall
displayed 1 2 3 4 5
displaying 1 2
displayonly
displays 1 2
distance 1 2 3 4 5 6
divide
divided 1 2 3
divideedge 1 2 3
dividing 1 2


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+create 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48
createanddisplaygo 1 2 3 4 5 6 7 8 9 10 11 12 13
created 1 2 3 4 5 6 7 8 9
creategroup 1 2
creates 1 2 3 4 5 6 7 8 9 10
creation 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
cross
cs
cs1
cs2
cube
current 1 2
currently 1 2 3 4
curvature
curve 1 2 3 4
curve2dmode
curve3dmode
curvecontinuity
curves 1 2 3 4 5
curving
cut 1 2 3 4
cut_without_f_2
cuts 1 2
cutting
cylinder 1 2 3 4 5 6
cylinders
cylindrical
+

+d 1 2 3
d1 1 2
d2 1 2
data
data_dir
default 1 2 3 4 5
define 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32
defined 1 2
defines 1 2
defining 1 2 3
definite 1 2
definition
deflection
degenerated
degree 1 2
degrees 1 2
delete
deleted
density
depending
depends
derivatives
descr
description 1 2 3 4 5
designed
destination
destined 1 2
detect 1 2
detection
detects
developed
dialog 1 2 3 4 5 6 7 8
differencelist
different 1 2
dimension 1 2 3
dimensions 1 2 3 4
dir 1 2
dir1
dir2
direction 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
directions 1 2 3
directly
dirfaceid1
dirfaceid1u
dirfaceid1v
dirfaceid2
dirfaceid2u
dirfaceid2v
display 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20
displayed 1 2 3 4 5
displayonly
displays
distance 1 2 3 4 5
divide
divided 1 2
divideedge 1 2
doesn 1 2
don 1 2 3 4
done 1 2
double 1 2 3 4
doubles
down
downward
drag
drawn
drop
dropsmalledges


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf3.htm b/doc/salome/gui/GEOM/whgdata/whlstf3.htm index 383b473ed..8c653842a 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf3.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf3.htm @@ -1,45 +1,45 @@ - - -Search Words List - - - - - - - -

<<

-

-does
doesn
don 1 2 3
done 1 2 3 4
double 1 2 3 4 5
doubles
down
dropsmalledges 1 2
dx 1 2 3 4 5 6
dy 1 2 3 4 5 6
dz 1 2 3 4 5
-

-e
e1
e2
e3
e4
easier
edge 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
edge_ind
edge_points
edge1
edge2
edge3
edge4
edgeid 1 2
edges 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
edit
editing
egdemaxtol
egdemintol
either
element 1 2 3 4 5 6
elementary
elements 1 2 3 4 5 6 7 8
ellipse 1 2 3
else 1 2
empty 1 2 3
encountered
end 1 2 3 4 5 6 7 8 9 10
ending 1 2
ends 1 2 3
enter 1 2
entire
entity 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33
equal 1 2
erase
eraseall
eraseonly
erases
error 1 2 3
errors 1 2
etc 1 2 3 4
example 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54
examples 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
except 1 2
existing 1 2 3
expand
explode 1 2 3 4 5 6 7
exploded 1 2 3 4
explodes
export 1 2
exportation
exporting
extra
extracted 1 2
extruded 1 2 3
extrusion 1 2
-

-f 1 2
f_2
f_ind_1
f_ind_2
f1
f1_id
f2
f3
f4
f5
f6


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+du
dump 1 2
duplicate
dx 1 2 3 4 5
dy 1 2 3 4 5
dz 1 2 3 4
+

+e
e1
e2
e3
e4
easier
edge 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22
edge_ind
edge_points
edge1
edge2
edge3
edge4
edgeid
edges 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
edit
editing
egdemaxtol
egdemintol
either 1 2
element 1 2 3
elementary
elements 1 2 3 4 5
ellipse 1 2
else 1 2
empty 1 2
encountered
end 1 2 3 4 5 6 7 8 9
ending
ends 1 2
enter
entire
entity 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29
equal 1 2 3
erase
eraseall
eraseonly
error 1 2
errors 1 2
etc 1 2
example 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
examples 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
except
existing 1 2 3
expand
explode 1 2 3 4
exploded 1 2
explodes
export 1 2 3
exportation
exporting
exports 1 2
extended
extra
extracted
extruded 1 2
extrusion
+

+f 1 2
f_2
f_ind_1
f_ind_2
f1
f1_id
f2
f3
f4
f5
f6
face 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28
face_name
face_rot
face1 1 2 3
face2 1 2 3
face3
faceid
facemaxtol
facemintol
faces 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
factor 1 2
failed 1 2
false


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf4.htm b/doc/salome/gui/GEOM/whgdata/whlstf4.htm index 7756269c7..7699ba2b5 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf4.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf4.htm @@ -1,43 +1,43 @@ - - -Search Words List - - - - - - - -

<<

-

-face 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34
face_name
face_rot
face1 1 2 3 4
face2 1 2 3 4
face3
faceid
facemaxtol
facemintol
faces 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
factor 1 2 3
failed 1 2
false 1 2
fields
file
files
fill 1 2 3
filled 1 2 3
fillet 1 2 3 4
filletall
fillets 1 2
filling 1 2 3 4
finally 1 2 3 4 5 6
first 1 2 3 4 5 6 7 8 9 10 11 12 13
firstly 1 2 3 4 5 6 7 8 9 10 11 12 13
fix 1 2
fixfacesize 1 2
fixing 1 2
fixshape 1 2 3
flag
flight_solid
following 1 2 3 4 5 6 7 8
format
formats 1 2
four 1 2
free 1 2 3 4 5 6
functionalities
functionality 1 2
functions 1 2 3
fuse 1 2 3 4
fuse_id
-

-gap 1 2
general 1 2
generate 1 2 3
generating
generation 1 2 3 4 5 6
geom 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
geom_object 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
geom_objects 1 2 3 4 5 6
geometric 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
geometrical 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19
geometry 1 2 3
geompy 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78
get 1 2 3 4 5
getenv
getfacenearpoint
getfreeboundary 1 2 3
getfreefacesids 1 2 3
getobjectids
getsubshape
getsubshapeid 1 2 3 4
getsubshapeindex
getting


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+file
files
fill
filled 1 2
fillet 1 2 3
filletall
fillets
filling 1 2 3 4
final
finally 1 2 3 4 5 6
first 1 2 3 4 5 6 7 8 9
firstly 1 2 3 4 5 6 7 8 9 10 11 12 13
fit
fix
fixes
fixfacesize
fixing
fixshape 1 2
flag
flight_solid
following 1 2 3 4 5 6 7
format 1 2 3
formats 1 2 3
four 1 2 3
frame
free 1 2 3 4 5
functionalities
functionality 1 2 3
functions 1 2 3 4
fuse 1 2 3 4
fuse_id
+

+g1
g2
gap
gcs
general 1 2
generate 1 2 3
generation 1 2 3 4 5 6
geom 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
geom_object 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
geom_objects 1 2 3 4
geometric 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21
geometrical 1 2 3 4 5 6 7 8 9 10 11 12 13 14
geometry 1 2 3 4 5 6
geompy 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71
get 1 2 3 4
getenv
getfacenearpoint
getfreeboundary 1 2
getfreefacesids 1 2
getobjectids
getsubshape
getsubshapeid 1 2 3
getsubshapeindex
getting
gg 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
given 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
gives
giving 1 2 3 4
global 1 2 3
glue 1 2 3 4 5
glued 1 2
glues
good
gravity 1 2 3 4
greater
group 1 2 3
group_n
group1
groups 1 2 3 4 5 6 7


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf5.htm b/doc/salome/gui/GEOM/whgdata/whlstf5.htm index cbcbc2159..1691b48db 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf5.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf5.htm @@ -1,45 +1,45 @@ - - -Search Words List - - - - - - - -

<<

-

-gg 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
given 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27
gives 1 2
giving 1 2 3
global 1 2
glue 1 2 3 4 5 6 7
glued 1 2 3
glues 1 2
graphic
gravity 1 2 3 4
group 1 2 3 4
group_n
group1
groups 1 2 3 4 5 6
gui
-

-half
handling
having 1 2 3 4
height 1 2 3 4 5 6 7 8
here
hexagonal
hexahedral 1 2 3 4
hexahedron
hide
hiding
highlight
highlights 1 2
holding
hole
holes 1 2 3
how
-

-i 1 2 3 4
i11
i12
i13
i21
i22
i23
i31
i32
i33
id 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
id_arc
id_archimede
id_axis
id_bezier
id_box 1 2 3 4
id_box_tr1
id_box_tr2
id_box1 1 2
id_box2 1 2
id_box3
id_chamfer_all
id_chamfer_e
id_chamfer_f
id_chamfer_f1
id_circle1
id_circle2
id_common
id_compound 1 2 3
id_cone1
id_cone2
id_cs1
id_cs2
id_cut 1 2
id_cut_without_f_2
id_cylinder 1 2
id_divide
id_edge 1 2 3
id_edge1
id_edge2
id_edge3
id_edge4
id_ellipse
id_face 1 2 3
id_face_rot
id_face1 1 2
id_face2 1 2
id_face3
id_fillet
id_filletall
id_filling
id_fuse
id_glue
id_group1
id_importbrep
id_interpol
id_line1
id_line2
id_make_block_explode
id_mirror1
id_mirror2
id_mirror3
id_offset
id_p_on_arc
id_p0
id_p1 1 2
id_p100
id_p2 1 2
id_p3 1 2
id_p4 1 2 3
id_partition1
id_partition2
id_partition3
id_pipe
id_plane 1 2
id_plane1
id_plane2
id_plane3
id_polyline
id_position
id_prism
id_prism1
id_prism2
id_ps
id_px
id_py
id_pz
id_qface1
id_qface2
id_qface3
id_result
id_revolution
id_rot1d
id_rot2d
id_rotation
id_scale
id_section
id_sewing
id_shape
id_shell
id_sketcher1
id_sketcher2
id_solid
id_solid1
id_solid2
id_sphere
id_sphere1
id_sphere2
id_sphere3
id_torus1
id_torus2
id_tr1d
id_tr2d
id_translation1
id_translation2
id_translation3
id_vector
id_vector1
id_vector2
id_vector3
id_vr
id_vxy
id_wire 1 2 3
id_wire_close
idlist 1 2
idlist_e
idlist_f
ids 1 2 3 4 5 6 7 8 9


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+ + +handling
having 1 2
height 1 2 3 4 5 6
here
hexagonal
hexahedral 1 2 3
hexahedron
hide 1 2
hides
hiding
highlight
highlights
holding
holes 1 2
how
+

+i 1 2 3 4
i11
i12
i13
i21
i22
i23
i31
i32
i33
id 1 2 3 4 5 6 7 8 9 10 11
id_arc
id_archimede
id_axis
id_bezier
id_box 1 2 3 4
id_box_tr1
id_box_tr2
id_box1 1 2
id_box2 1 2
id_box3
id_chamfer_all
id_chamfer_e
id_chamfer_f
id_chamfer_f1
id_circle1
id_circle2
id_common
id_compound 1 2 3
id_cone1
id_cone2
id_cs1
id_cs2
id_cut 1 2
id_cut_without_f_2
id_cylinder 1 2
id_divide
id_edge 1 2 3
id_edge1
id_edge2
id_edge3
id_edge4
id_ellipse
id_face 1 2 3
id_face_rot
id_face1 1 2
id_face2 1 2
id_face3
id_fillet
id_filletall
id_filling
id_fuse
id_glue
id_group1
id_importbrep
id_interpol
id_line1
id_line2
id_make_block_explode
id_mirror1
id_mirror2
id_mirror3
id_offset
id_p_on_arc
id_p0
id_p1 1 2
id_p100
id_p2 1 2
id_p3 1 2
id_p4 1 2 3
id_partition1
id_partition2
id_partition3
id_pipe
id_plane 1 2
id_plane1
id_plane2
id_plane3
id_polyline
id_position
id_prism
id_prism1
id_prism2
id_ps
id_px
id_py
id_pz
id_qface1
id_qface2
id_qface3
id_result
id_revolution
id_rot1d
id_rot2d
id_rotation
id_scale
id_section
id_sewing
id_shape
id_shell
id_sketcher1
id_sketcher2
id_solid
id_solid1
id_solid2
id_sphere
id_sphere1
id_sphere2
id_sphere3
id_torus1
id_torus2
id_tr1d
id_tr2d
id_translation1
id_translation2
id_translation3
id_vector
id_vector1
id_vector2
id_vector3
id_vr
id_vxy
id_wire 1 2 3
id_wire_close
idlist 1 2
idlist_e
idlist_f
ids 1 2 3 4 5 6
if 1 2 3 4 5 6 7 8 9 10 11 12 13 14
iges 1 2 3
image 1 2 3 4
implemented
implies
imply
import 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17
importation
importbrep
importcomponentgui 1 2 3 4 5 6 7 8 9 10 11 12 13 14
imported 1 2 3
importing
impossible
improve


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf6.htm b/doc/salome/gui/GEOM/whgdata/whlstf6.htm index 96c20a78b..2ae988521 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf6.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf6.htm @@ -1,47 +1,49 @@ - - -Search Words List - - - - - - - -

<<

-

-if 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
iges 1 2
image 1 2 3
implemented
import 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
importation
importbrep
importcomponentgui 1 2 3 4 5 6 7 8 9 10 11 12 13 14
imported 1 2 3 4
importing
impossible
improve
included
increased 1 2
independent
independently
index
indexes
indicate
indicating
indices 1 2 3 4 5
inertia 1 2
informs
initial 1 2 3 4 5 6 7
inner 1 2
inquired
ins
inserted 1 2
inside 1 2
instead
integer 1 2
integers 1 2 3
intended 1 2
interactively 1 2
intermediate
internal 1 2 3
interpol
interpolated
intersect 1 2
intersected 1 2
intersection 1 2
introduction 1 2
invalid 1 2 3 4
invisible
isbyparameter 1 2
iscommonvertex 1 2
isolines
isos
isplanarface
isplanarwanted 1 2 3 4
issuccess
isvalid 1 2
iterations 1 2
itself 1 2
ix 1 2
iy 1 2
iz 1 2
-

-just
-

-keep 1 2 3 4 5 6
keyboard
ko
-

-l 1 2
last 1 2 3 4
lcs 1 2
least 1 2
leaves
left
len
length 1 2 3 4 5
less 1 2
lie 1 2
limit 1 2
line 1 2 3 4 5 6
line1
line2
linear
lines 1 2
list 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30
listchains
listoffaceid 1 2
listofgeomshapes 1 2
listofid 1 2 3
listofind
listofkeepinside 1 2
listofmaterials 1 2
listofremoveinside 1 2
listofshape 1 2 3 4 5 6 7 8 9
listofshapeid
listofshapes 1 2 3 4
listoftools 1 2
listofwireid 1 2
listshapes
local 1 2 3 4 5 6 7
localop
located 1 2
location 1 2 3 4 5 6
lsc
lying 1 2 3


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+included
increased
independent
index
indexes
indicate
indicating
indices 1 2 3 4
inertia 1 2
informs
initial 1 2 3 4 5 6
inner
inquired
ins
inserted
inside
instead
integer
integers 1 2
interactively
intermediate
internal 1 2
interpol
interpolated
intersect
intersected
intersection
introduction 1 2 3
invalid 1 2 3
invert
invisible
isbyparameter
iscommonvertex
isolines 1 2
isometric
isos
isplanarface
isplanarwanted 1 2 3 4
issuccess
isvalid 1 2
iterations
itself
ix 1 2
iy 1 2
iz 1 2
+

+joined
jpeg 1 2
jpg 1 2
junction
just
+

+k
keep 1 2 3 4 5
keyboard
ko
+

+l 1 2
last 1 2
lcs 1 2
lcs1
lcs2
least
leaves
left 1 2 3
len
length 1 2 3 4
lie 1 2
limit
line 1 2 3 4
line1
line2
linear
lines 1 2
list 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25
listchains
listoffaceid
listofgeomshapes
listofid
listofind
listofkeepinside
listofmaterials
listofremoveinside
listofshape 1 2 3 4 5 6
listofshapes 1 2
listoftools
listofwireid
listshapes
ll
local 1 2 3 4 5
localcs1
localcs2
localop
located
location 1 2 3 4
locking
lsc
lying 1 2
+

+magnitude
main 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
mainshape
major 1 2
make 1 2 3 4 5 6
make_block_explode
makearc 1 2 3 4 5 6 7
makebezier 1 2
makeblockexplode 1 2
makeboolean 1 2
makebox 1 2 3 4 5 6
makeboxdxdydz 1 2 3 4 5 6
makeboxtwopnt 1 2 3 4
makecdg 1 2
makechamfer
makechamferall 1 2
makechamferedge 1 2
makechamferfaces 1 2
makecircle 1 2
makecirclethreepnt 1 2
makecommon 1 2
makecompound 1 2 3 4 5
makecone 1 2 3
makeconer1r2h 1 2
makecut 1 2
makecylinder 1 2 3 4
makecylinderrh
makeedge 1 2 3 4 5
makeellipse 1 2
makeface 1 2 3 4 5 6 7
makefaces 1 2
makefacewires 1 2
makefillet 1 2
makefilletall 1 2
makefilling 1 2
makefuse 1 2
makegluefaces 1 2 3
makehalfpartition 1 2
makehexa 1 2
makehexa2faces 1 2
makeinterpol 1 2
makeline 1 2
makelinetwopnt 1 2
makemarker 1 2
makemirrorbyaxis 1 2
makemirrorbyplane 1 2
makemirrorbypoint 1 2
makemultirotation1d
makemultirotation2d
makemultitransformation1d 1 2
makemultitransformation2d 1 2
makemultitranslation1d 1 2
makemultitranslation2d 1 2
makeoffset 1 2
makepartition 1 2
makepipe 1 2
makeplane 1 2 3
makeplaneface 1 2
makeplanethreepnt 1 2 3
makepolyline 1 2
makeposition 1 2
makeprism 1 2 3
makeprismvech 1 2 3 4
makequad 1 2
makequad2edges 1 2
makequad4vertices 1 2
makerevolution 1 2
makerotation 1 2 3
makes 1 2 3 4 5
makescaletransform 1 2
makesection 1 2
makesewing 1 2
makeshell 1 2
makesketcher 1 2 3
makesketcheronplane
makesolid 1 2
makesphere 1 2 3
makespherepntr
makespherer 1 2 3 4
maketorus 1 2
maketorusrr 1 2
maketranslation 1 2 3
maketranslationtwopoints 1 2
maketranslationvector 1 2
makevector 1 2 3 4 5 6 7 8 9
makevectordxdydz 1 2 3 4
makevertex 1 2 3 4 5 6 7 8 9 10 11 12 13 14
makevertexoncurve 1 2
makevertexwithref 1 2
makewire 1 2 3 4 5 6 7
manually
marked
mass
masses
materials
math 1 2 3
matrix 1 2
max 1 2 3 4
maxdeg
maxdegree
maximal 1 2 3
maximum 1 2 3 4
maxnbfaces
maxtolerance
maxtolerance3d


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf7.htm b/doc/salome/gui/GEOM/whgdata/whlstf7.htm index 7a0db22ff..ae1ba0212 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf7.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf7.htm @@ -1,43 +1,45 @@ - - -Search Words List - - - - - - - -

<<

-

- - -main 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69
mainshape
major 1 2 3 4
make 1 2 3 4 5 6 7
make_block_explode
makearc 1 2 3 4 5 6 7 8
makebezier 1 2 3
makeblockexplode 1 2 3
makeboolean 1 2
makebox 1 2 3 4 5 6 7
makeboxdxdydz 1 2 3 4 5 6
makeboxtwopnt 1 2 3 4
makecdg 1 2
makechamfer
makechamferall 1 2
makechamferedge 1 2 3
makechamferface
makechamferfaces 1 2
makecircle 1 2 3
makecirclethreepnt 1 2
makecommon 1 2
makecompound 1 2 3 4 5 6
makecone 1 2 3 4
makeconer1r2h 1 2
makecut 1 2
makecylinder 1 2 3 4 5
makecylinderrh
makeedge 1 2 3 4 5 6
makeellipse 1 2 3
makeface 1 2 3 4 5 6 7 8
makefaces 1 2
makefacewires 1 2
makefillet 1 2 3
makefilletall 1 2
makefilling 1 2 3
makefuse 1 2
makegluefaces 1 2 3 4
makehalfpartition 1 2
makehexa 1 2
makehexa2faces 1 2
makeinterpol 1 2 3
makeline 1 2 3
makelinetwopnt 1 2
makemarker 1 2 3
makemirrorbyaxis 1 2
makemirrorbyplane 1 2 3
makemirrorbypoint 1 2
makemultirotate1d
makemultirotate2d
makemultirotation1d 1 2
makemultirotation2d 1 2
makemultitransformation1d 1 2 3
makemultitransformation2d 1 2 3
makemultitranslation1d 1 2 3
makemultitranslation2d 1 2 3
makeoffset 1 2 3
makepartition 1 2 3
makepipe 1 2 3
makeplane 1 2 3 4
makeplaneface 1 2
makeplanethreepnt 1 2 3
makepolyline 1 2 3
makeposition 1 2 3
makeprism 1 2 3 4
makeprismvech 1 2 3 4
makequad 1 2
makequad2edges 1 2
makequad4vertices 1 2
makerevolution 1 2 3
makerotation 1 2 3 4
makes 1 2 3 4 5 6 7
makescaletransform 1 2 3
makesection 1 2
makesewing 1 2 3
makeshell 1 2 3
makesketcher 1 2 3
makesketcheronplane
makesolid 1 2 3
makesphere 1 2 3 4
makespherepntr
makespherer 1 2 3 4
maketorus 1 2 3
maketorusrr 1 2
maketranslation 1 2 3 4
maketranslationtwopoints 1 2
maketranslationvector 1 2
makevector 1 2 3 4 5 6 7 8 9 10
makevectordxdydz 1 2 3 4
makevertex 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
makevertexoncurve 1 2 3
makevertexwithref 1 2 3
makewire 1 2 3 4 5 6 7 8
manually 1 2
mass
masses
materials 1 2
math 1 2 3
matrix 1 2
max 1 2 3 4 5 6 7
maxdeg
maxdegree 1 2
maximal 1 2 3 4 5 6
maximum 1 2 3 4 5 6
maxnbfaces 1 2
maxtolerance 1 2
maxtolerance3d 1 2


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+meaning
means 1 2 3
measurement 1 2
measures
mechanisms
meet
memorise
mentioned
menu 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
merge
mesh 1 2 3
meshes
meshing 1 2
meshingdeflection 1 2
method
middle 1 2
min 1 2 3 4
min_dist
mindeg
mindegree
mindistance 1 2
minimal 1 2 3 4
minimum 1 2 3
minnbfaces
minor 1 2
mirror 1 2
mirror1
mirror2
mirror3
mirrored
mode 1 2 3 4 5 6
modeled
models 1 2
modes
modified
modifies 1 2
modify 1 2
module 1 2 3 4
moment
moments 1 2
mouse 1 2
move
moved
much
multi 1 2 3 4 5
multirotate1d 1 2
multirotate2d 1 2
multitude
must 1 2 3 4 5
+

+n
name 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
names
nb 1 2 3 4
nb_sub
nbiter 1 2
nbounding
nbox
nbsplitpoints
nbtimes 1 2 3
nbtimes1 1 2
nbtimes2 1 2
nbtimesu
nbtimesv
ncentre
ncompound
necessarily
necessary 1 2 3 4 5
need 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
needed
negative
neighbouring
new 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32
newly
ninertia
nminimal
nodes
noerror
none
normal 1 2 3 4 5 6
note
nothing
notions
nth
number 1 2 3 4 5 6 7 8 9 10 11 12 13
numbers
+

+object 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31
objects 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
obtain 1 2 3
obtained


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf8.htm b/doc/salome/gui/GEOM/whgdata/whlstf8.htm index 83c34c13c..4fe7761c0 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf8.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf8.htm @@ -1,43 +1,43 @@ - - -Search Words List - - - - - - - -

<<

-

-meaning 1 2
means 1 2 3 4
measurement 1 2
measures
mechanisms
mentioned
menu 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73
merging 1 2
mesh 1 2
meshing 1 2 3
meshingdeflection 1 2 3
method
middle 1 2
min 1 2 3 4 5 6
min_dist
mindeg
mindegree 1 2
mindistance 1 2
minimal 1 2 3 4 5 6
minimum 1 2 3
minnbfaces 1 2
minor 1 2 3 4
mirror 1 2 3
mirror1
mirror2
mirror3
mirrored 1 2
mode 1 2 3 4 5 6 7
modeled 1 2
models
modes 1 2
modification 1 2
modified 1 2
modifies 1 2 3 4
modify 1 2 3
module 1 2
moment
moments 1 2
move 1 2
moved 1 2
much
multi 1 2 3 4 5 6 7 8
multirotate1d
multirotate2d
multitude 1 2
must 1 2 3 4 5 6 7
-

-name 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58
names 1 2
nb 1 2 3 4
nb_sub
nbiter 1 2 3
nbounding
nbox
nbsplitpoints 1 2
nbtimes 1 2 3 4 5
nbtimes1 1 2 3
nbtimes2 1 2 3
nbtimesu 1 2
nbtimesv 1 2
ncentre
ncompound
necessary 1 2 3 4 5 6 7
need 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15
needed 1 2
negative 1 2
neigbour 1 2
new 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36
ninertia
nminimal
nodes 1 2
noerror 1 2
none
normal 1 2 3 4 5 6 7 8 9 10
note
nothing
notions


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+occ 1 2 3 4 5 6 7 8 9 10
occurred
offset 1 2
ok 1 2 3 4
old
one 1 2 3 4 5 6 7 8 9 10 11 12 13
opaque
open 1 2 3 4 5 6
opening
opens
openwires 1 2
operation 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53
operations 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37
operator
operators 1 2
opportunity
opposite
optimization 1 2
option
options
order
orientate
orientation
oriented
origin 1 2 3 4 5 6 7 8
os
otherwise 1 2 3 4 5 6
our 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
out 1 2
outside
ox 1 2
oy
oz 1 2 3 4
+

+p
p_25_25_50
p_25_50_25
p_50_25_25
p_on_arc
p0 1 2 3 4 5 6 7 8
p1 1 2 3 4 5 6 7 8
p10
p100
p11
p12
p13
p2 1 2 3 4 5 6 7 8
p200 1 2
p3 1 2 3 4 5 6
p4 1 2 3 4
p5 1 2 3 4
p50
p6 1 2
p7 1 2
p70
p8 1 2
p9
panning
parallel 1 2 3 4
parameter 1 2 3 4
parameterization
parameters 1 2 3 4 5 6 7 8 9
parametric
paramter
part 1 2 3
partition 1 2
partition1
partition2
partition3
parts
passed
passes 1 2 3 4
passing
path 1 2
pathshape
perform 1 2 3
performed
perpendicular
pi 1 2 3
picture
pipe 1 2
place
placed
places
planar 1 2 3 4 5
plane 1 2 3 4 5 6 7 8 9 10
plane1
plane2
plane3
planes 1 2 3
plug
plunged


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstf9.htm b/doc/salome/gui/GEOM/whgdata/whlstf9.htm index 8621048b5..e6bc71836 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstf9.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstf9.htm @@ -1,45 +1,45 @@ - - -Search Words List - - - - - - - -

<<

-

-number 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16
numbers 1 2
numeber
-

-object 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35
objects 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46
obtain
obtained
occ 1 2 3 4 5 6 7 8 9 10 11
occurred 1 2
offers
offset 1 2 3
ok 1 2 3 4 5
old
one 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18
ones 1 2
opaque
open 1 2 3 4 5 6
opening
openwires 1 2 3
operation 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55
operations 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
operator 1 2
operators 1 2 3
opportunity
opposite 1 2
optimization
option 1 2
options
order 1 2
oriented 1 2
origin 1 2 3 4 5 6 7 8 9
os
otherwise 1 2 3 4 5 6 7 8
our 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
outside 1 2
ox 1 2 3
oy 1 2
oz 1 2 3 4 5
-

-p
p_25_25_50
p_25_50_25
p_50_25_25
p_on_arc
p0 1 2 3 4 5 6 7 8
p1 1 2 3 4 5 6 7 8
p10
p100
p11
p12
p13
p2 1 2 3 4 5 6 7 8
p200 1 2
p3 1 2 3 4 5 6
p4 1 2 3 4
p5 1 2 3 4
p50
p6 1 2
p7 1 2
p70
p8 1 2
p9


>> - - - - - + + +Search Words List + + + + + + + +

<<

+

+png 1 2
point 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26
point1 1 2 3 4 5 6 7 8 9 10 11
point2 1 2 3 4 5 6 7 8 9 10 11
point3 1 2 3 4 5
point4 1 2
point5
pointcoordinates 1 2
points 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
polyline 1 2
pop 1 2
position 1 2 3 4 5 6
positional
positions
possibilities
possibility
possible 1 2 3 4 5
precision 1 2
predefined
presentation
press
pressed
presumes
preview
previous 1 2
primitives 1 2 3 4 5 6 7 8
print 1 2
printed
prism 1 2 3 4 5
prism_edges
prism_faces 1 2
prism1
prism2
prisms 1 2
problems
process 1 2
processed 1 2 3 4
processes
processing 1 2
processshape 1 2
produce 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23
program
projection
projections
propagate 1 2
propagation 1 2
properties 1 2
proportional
props
provide 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59
providing
ps
put
px 1 2 3 4 5
pxy
pxyz 1 2 3
py 1 2 3 4 5
py1
python
pz 1 2 3 4 5 6
+

+qface1
qface2
qface3
qface4
qface5
qface6
qface7
qface8
quadrangle 1 2 3 4
+

+r 1 2 3
radio
radius 1 2 3 4 5 6 7 8 9 10 11
radius1 1 2 3 4 5
radius2 1 2
radius3
radiuses 1 2 3 4
radiusmajor 1 2
radiusminor 1 2
raise 1 2 3
range 1 2 3 4 5 6
recent
reconstruction
redefine
reduce
reference 1 2
refreshes
regarding
relative
relatively
relevant
remain 1 2
remainder
remote
remove 1 2 3 4 5
removed 1 2 3 4 5 6 7 8 9
removeobject 1 2
removes 1 2 3
removewebs
removing
rename
repair 1 2 3 4 5 6 7 8 9 10
repairing 1 2 3 4 5 6 7 8 9 10 11 12 13
repetition 1 2
repetitions
representation
represented
representing 1 2
represents
required 1 2
requireddegree
requirednbsegments
requires
res
reset
resizes
respect 1 2
restore
restores
restriction
result 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60
resultant
resulting 1 2 3 4 5
results 1 2 3 4 5 6
retrieves
return
returned 1 2 3
returning
returns 1 2 3 4 5
reverse 1 2
revolution 1 2 3


>> + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl0.htm b/doc/salome/gui/GEOM/whgdata/whlstfl0.htm index db5af94cf..a8d6ceb56 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl0.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl0.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ { {D {E {S {D {N {S {D {R {S ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ { {D {E {D ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl1.htm b/doc/salome/gui/GEOM/whgdata/whlstfl1.htm index 10562276e..3ddd0ea89 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl1.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl1.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ AB AC AD AI AL AN AP AR AS AT AU AV AX ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ AB AC AD AL AN AP AR AU AV AX ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl10.htm b/doc/salome/gui/GEOM/whgdata/whlstfl10.htm index 826e1f2fe..c098d325e 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl10.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl10.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ KE KO ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ JO JP JU ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl11.htm b/doc/salome/gui/GEOM/whgdata/whlstfl11.htm index 1e32f1e9f..4547492c4 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl11.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl11.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ L LA LC LE LI LO LS LY ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ K KE KO ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl12.htm b/doc/salome/gui/GEOM/whgdata/whlstfl12.htm index f576ce1ff..07c629bc7 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl12.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl12.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ MA ME MI MO MU ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ L LA LC LE LI LL LO LS LY ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl13.htm b/doc/salome/gui/GEOM/whgdata/whlstfl13.htm index 989911bef..fa383d41a 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl13.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl13.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ NA NB NC NE NI NM NO NU ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ MA ME MI MO MU ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl14.htm b/doc/salome/gui/GEOM/whgdata/whlstfl14.htm index 14bc0131d..60532d353 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl14.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl14.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ OB OC OF OK OL ON OP OR OS OT OU OX OY OZ ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ N NA NB NC NE NI NM NO NT NU ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl15.htm b/doc/salome/gui/GEOM/whgdata/whlstfl15.htm index 3736f7330..68165a4f0 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl15.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl15.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ P PA PE PI PL PO PR PS PU PX PY PZ ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ OB OC OF OK OL ON OP OR OS OT OU OX OY OZ ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl16.htm b/doc/salome/gui/GEOM/whgdata/whlstfl16.htm index db9b94b57..eda34ce91 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl16.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl16.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ QF QU ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ P PA PE PI PL PN PO PR PS PU PX PY PZ ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl17.htm b/doc/salome/gui/GEOM/whgdata/whlstfl17.htm index 4478c04f8..a4abf7108 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl17.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl17.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ R RA RE RI RO RU ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ QF QU ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl18.htm b/doc/salome/gui/GEOM/whgdata/whlstfl18.htm index 93f9a8bb0..e11002aa0 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl18.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl18.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ S SA SC SE SG SH SI SK SM SO SP SQ ST SU SY ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ R RA RE RI RO RU ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl19.htm b/doc/salome/gui/GEOM/whgdata/whlstfl19.htm index 0918a611f..0a710d8a9 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl19.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl19.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ T TA TE TH TI TO TR TT TU TW TY ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ S SA SC SE SG SH SI SK SM SO SP SQ ST SU SY ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl2.htm b/doc/salome/gui/GEOM/whgdata/whlstfl2.htm index d01482bb2..b122abd54 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl2.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl2.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ B BA BB BE BI BL BO BR BS BU BY ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ B BA BB BE BL BM BO BR BS BU BY ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl20.htm b/doc/salome/gui/GEOM/whgdata/whlstfl20.htm index ac4a556b6..095ab4760 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl20.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl20.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ UN UP US ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ T TA TE TH TI TO TR TT TU TW TY ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl21.htm b/doc/salome/gui/GEOM/whgdata/whlstfl21.htm index 31bc56d92..1d1f4d32b 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl21.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl21.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ V VA VE VI VO VR VT VX VZ ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ U UN UP US ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl22.htm b/doc/salome/gui/GEOM/whgdata/whlstfl22.htm index 8e217ed30..ca8764f6b 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl22.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl22.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ W WA WE WF WH WI WO WW ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ V VA VE VI VO VR VT VX VZ ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl23.htm b/doc/salome/gui/GEOM/whgdata/whlstfl23.htm index b3a7a03ff..57d263d57 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl23.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl23.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ X XD XM XO XY XZ ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ W WA WE WF WH WI WO WW ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl24.htm b/doc/salome/gui/GEOM/whgdata/whlstfl24.htm index 9717a0693..c0564aa39 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl24.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl24.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ Y YD YM YO YZ ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ X XD XM XO XY XZ ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl25.htm b/doc/salome/gui/GEOM/whgdata/whlstfl25.htm index fef3d3fba..2d94192b0 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl25.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl25.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ Z ZE ZM ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ Y YD YM YO YZ ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl26.htm b/doc/salome/gui/GEOM/whgdata/whlstfl26.htm index e26fd56af..c096d46be 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl26.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl26.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ Z ZE ZM ZO ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ Z ZE ZM ZO ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl3.htm b/doc/salome/gui/GEOM/whgdata/whlstfl3.htm index 0eaa79900..819f2db3e 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl3.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl3.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ C CA CE CH CI CL CM CO CR CS CU CY ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ C CA CE CH CI CL CM CN CO CR CS CU CY ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl4.htm b/doc/salome/gui/GEOM/whgdata/whlstfl4.htm index 14d3e4533..4f958b9c2 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl4.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl4.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ D DA DE DI DO DR DX DY DZ ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ D DA DE DI DO DR DU DX DY DZ ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl5.htm b/doc/salome/gui/GEOM/whgdata/whlstfl5.htm index c7b1ee66e..6436a8110 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl5.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl5.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ E EA ED EG EI EL EM EN EQ ER ET EX ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ E EA ED EG EI EL EM EN EQ ER ET EX ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl6.htm b/doc/salome/gui/GEOM/whgdata/whlstfl6.htm index 9959aea31..aeeed420f 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl6.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl6.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ F FA FI FL FO FR FU ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ F FA FI FL FO FR FU ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl7.htm b/doc/salome/gui/GEOM/whgdata/whlstfl7.htm index a7c64dea2..8f8665a31 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl7.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl7.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ GA GE GG GI GL GR GU ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ G GA GC GE GG GI GL GO GR ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl8.htm b/doc/salome/gui/GEOM/whgdata/whlstfl8.htm index ea456ba3c..124e38af9 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl8.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl8.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ HA HE HI HO ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ HA HE HI HO ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstfl9.htm b/doc/salome/gui/GEOM/whgdata/whlstfl9.htm index b48aae316..c8ce4cd0e 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstfl9.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstfl9.htm @@ -1,45 +1,45 @@ - - -Search Words letter - - - - - - - - - -

^ I ID IF IG IM IN IS IT IX IY IZ ^

- - - - - + + +Search Words letter + + + + + + + + + +

^ I ID IF IG IM IN IS IT IX IY IZ ^

+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstg0.htm b/doc/salome/gui/GEOM/whgdata/whlstg0.htm index a9d3f26ba..193fb7c67 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstg0.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstg0.htm @@ -1,75 +1,75 @@ - - -Glossary words list - - - - - - - -

Cell

-

Element of a mesh. Cells are determined by their connectivity. They can have 0,1,2 or 3 dimension.

-

Component

-

One integer or real value can correspond to each component of a field and to each entity of a mesh

-

Descendant connectivity

-

It is a description of the entities of the mesh with dimension N. This description is made by an ordered list of geometrical entities (nodes, edges, or faces) with dimension N-1.

-

Edge

-

An edge of a volumetric or surface mesh. It is composed of 2 or 3 nodes (2 vertex nodes and optionally one middle node).

-

Entity of a mesh

-

Geometrical component of the mesh: node, cell, face and edge. Faces and edges are only intermediate entities allowing to define the cells in descendant connectivity.

-

Equivalence

-

Equivalence represents a list of correspondance 2 by 2 of the entities of the same dimension.

-

Face

-

Face of a volumetrical cell (triangle, quadrangle).

-

Family

-

Entities of a mesh are described by a certain number  of characteristics (boundary conditions, groups membership). Families represent classes equivalent to these characteristics (two entities of a mesh can belong to the same family if they have the same characteristics). Every family is determined by a set of attributes and a list of groups membership.

-

Field

-

Field consists of one or several scalar components. One definite type is associated to the given field and the values corresponding to different components are all of the same type.

-

Field profile

-

Fields can be defined only on one part of the mesh. Profile  of the field or profile of the component of a field indicates which entities of the mesh contain values.

-

Group

-

Unordered set of entities of a mesh. One entity can belong to  several groups.

-

Mesh

-

Mesh is described by its geometry: list of nodes and list of cells which constitute this mesh. Supplementary information is added with the help of families (initial, boundary conditions).

-

Nodal connectivity

-

It is a description of an entity of the mesh by an ordered list of nodes constituting this entity.

-

Node

-

Node can be an isolated node of a mesh, a vertex or middle node of an edge. A node is associated to a point.

-

Point

-

Geometrical entity determined by its coordinates in the space.

-

Reference connectivity

-

For each type of entity of a mesh, reference connectivity define the topology of an entity.

-

Result

-

List of fields referring to one mesh.

-

Study

-

Study represents a chain of sequences of calculations.

-



- - - - - + + +Glossary words list + + + + + + + +

Cell

+

Element of a mesh. Cells are determined by their connectivity. They can have 0,1,2 or 3 dimension.

+

Component

+

One integer or real value can correspond to each component of a field and to each entity of a mesh

+

Descendant connectivity

+

It is a description of the entities of the mesh with dimension N. This description is made by an ordered list of geometrical entities (nodes, edges, or faces) with dimension N-1.

+

Edge

+

An edge of a volumetric or surface mesh. It is composed of 2 or 3 nodes (2 vertex nodes and optionally one middle node).

+

Entity of a mesh

+

Geometrical component of the mesh: node, cell, face and edge. Faces and edges are only intermediate entities allowing to define the cells in descendant connectivity.

+

Equivalence

+

Equivalence represents a list of correspondance 2 by 2 of the entities of the same dimension.

+

Face

+

Face of a volumetrical cell (triangle, quadrangle).

+

Family

+

Entities of a mesh are described by a certain number  of characteristics (boundary conditions, groups membership). Families represent classes equivalent to these characteristics (two entities of a mesh can belong to the same family if they have the same characteristics). Every family is determined by a set of attributes and a list of groups membership.

+

Field

+

Field consists of one or several scalar components. One definite type is associated to the given field and the values corresponding to different components are all of the same type.

+

Field profile

+

Fields can be defined only on one part of the mesh. Profile  of the field or profile of the component of a field indicates which entities of the mesh contain values.

+

Group

+

Unordered set of entities of a mesh. One entity can belong to  several groups.

+

Mesh

+

Mesh is described by its geometry: list of nodes and list of cells which constitute this mesh. Supplementary information is added with the help of families (initial, boundary conditions).

+

Nodal connectivity

+

It is a description of an entity of the mesh by an ordered list of nodes constituting this entity.

+

Node

+

Node can be an isolated node of a mesh, a vertex or middle node of an edge. A node is associated to a point.

+

Point

+

Geometrical entity determined by its coordinates in the space.

+

Reference connectivity

+

For each type of entity of a mesh, reference connectivity define the topology of an entity.

+

Result

+

List of fields referring to one mesh.

+

Study

+

Study represents a chain of sequences of calculations.

+



+ + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlsti0.htm b/doc/salome/gui/GEOM/whgdata/whlsti0.htm index a3aec907a..32e2c7fd9 100755 --- a/doc/salome/gui/GEOM/whgdata/whlsti0.htm +++ b/doc/salome/gui/GEOM/whgdata/whlsti0.htm @@ -1,39 +1,39 @@ - - - -Index words list - - - - - - - - - - - - + + + +Index words list + + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt0.htm b/doc/salome/gui/GEOM/whgdata/whlstt0.htm index 94f11bfa7..98e3b2c07 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt0.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt0.htm @@ -1,51 +1,51 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt1.htm b/doc/salome/gui/GEOM/whgdata/whlstt1.htm index 5ac9ac972..71d6e3159 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt1.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt1.htm @@ -1,58 +1,58 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt10.htm b/doc/salome/gui/GEOM/whgdata/whlstt10.htm index d67082cb2..204cdfe22 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt10.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt10.htm @@ -1,65 +1,68 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-       Basic Operations
-          Partition
-          Archimede
-       Boolean Operations
-       Transformation Operations
-       Blocks Operations
-       Repairing Operations
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+       Basic Operations
+       Boolean Operations
+          Using boolean operations
+          Fuse
+          Common
+          Cut
+          Section
+       Transformation Operations
+       Blocks Operations
+       Repairing Operations
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt11.htm b/doc/salome/gui/GEOM/whgdata/whlstt11.htm index cb6cf0d79..1a34a2504 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt11.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt11.htm @@ -1,68 +1,73 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-       Basic Operations
-       Boolean Operations
-          Using boolean operations
-          Fuse
-          Common
-          Cut
-          Section
-       Transformation Operations
-       Blocks Operations
-       Repairing Operations
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+       Basic Operations
+       Boolean Operations
+       Transformation Operations
+          Translation
+          Rotation
+          Modify the Location
+          Mirror Image
+          Scale Transform
+          Offset Surface
+          Multi Translation
+          Multi Rotation
+          Fillet
+          Chamfer
+       Blocks Operations
+       Repairing Operations
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt12.htm b/doc/salome/gui/GEOM/whgdata/whlstt12.htm index fac265f7d..af8e2ab44 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt12.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt12.htm @@ -1,73 +1,66 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-       Basic Operations
-       Boolean Operations
-       Transformation Operations
-          Translation
-          Rotation
-          Modify the Location
-          Mirror Image
-          Scale Transform
-          Offset Surface
-          Multi Translation
-          Multi Rotation
-          Fillet
-          Chamfer
-       Blocks Operations
-       Repairing Operations
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+       Basic Operations
+       Boolean Operations
+       Transformation Operations
+       Blocks Operations
+          Multi Transformation
+          Explode on Blocks
+          Propagate
+       Repairing Operations
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt13.htm b/doc/salome/gui/GEOM/whgdata/whlstt13.htm index b168f2789..a6ad5342f 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt13.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt13.htm @@ -1,66 +1,73 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-       Basic Operations
-       Boolean Operations
-       Transformation Operations
-       Blocks Operations
-          Multi Transformation
-          Explode on Blocks
-          Propagate
-       Repairing Operations
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+       Basic Operations
+       Boolean Operations
+       Transformation Operations
+       Blocks Operations
+       Repairing Operations
+          Shape Processing
+          Suppress Faces
+          Close Contour
+          Suppress Internal Wires
+          Suppress Holes
+          Sewing
+          Glue Faces
+          Add Point on Edge
+          Check Free Boundaries
+          Check Free Faces
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt14.htm b/doc/salome/gui/GEOM/whgdata/whlstt14.htm index a7e8225fb..af1ba14e7 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt14.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt14.htm @@ -1,73 +1,63 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-       Basic Operations
-       Boolean Operations
-       Transformation Operations
-       Blocks Operations
-       Repairing Operations
-          Shape Processing
-          Suppress Faces
-          Close Contour
-          Suppress Internal Wires
-          Suppress Holes
-          Sewing
-          Glue Faces
-          Add Point on Edge
-          Check Free Boundaries
-          Check Free Faces
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+       Viewing Geometrical Objects
+       Creating Geometric Objects
+       Transformation
+       Measurement Tools
+       Access to Geometry module functionality from Python (using geompy.py)
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt15.htm b/doc/salome/gui/GEOM/whgdata/whlstt15.htm index 1a3266508..a55c4689c 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt15.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt15.htm @@ -1,62 +1,69 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-       Changing Display Parameters
-       Creation of Geometric Objects
-       Transformation
-       Measurement Tools
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+       Viewing Geometrical Objects
+       Creating Geometric Objects
+          Basic Geometrical Objects
+          Primitives
+          Complex Objects
+          Working with Groups
+          Building by Blocks
+          Sketcher
+          Advanced Geometrical Objects
+       Transformation
+       Measurement Tools
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt16.htm b/doc/salome/gui/GEOM/whgdata/whlstt16.htm index 6a3fe4cba..941a0790c 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt16.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt16.htm @@ -1,69 +1,67 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-       Changing Display Parameters
-       Creation of Geometric Objects
-          Basic Geometrical Objects
-          Primitives
-          Complex Objects
-          Working with Groups
-          Building by Blocks
-          Sketcher
-          Advanced Geometrical Objects
-       Transformation
-       Measurement Tools
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+       Viewing Geometrical Objects
+       Creating Geometric Objects
+       Transformation
+          Basic Operations
+          Boolean Operations
+          Transformation Operations
+          Blocks Operations
+          Repairing Operations
+       Measurement Tools
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt17.htm b/doc/salome/gui/GEOM/whgdata/whlstt17.htm deleted file mode 100755 index fe76d63f4..000000000 --- a/doc/salome/gui/GEOM/whgdata/whlstt17.htm +++ /dev/null @@ -1,67 +0,0 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-       Changing Display Parameters
-       Creation of Geometric Objects
-       Transformation
-          Basic Operations
-          Boolean Operations
-          Transformation Operations
-          Blocks Operations
-          Repairing Operations
-       Measurement Tools
-

- -
-

-

- - - - diff --git a/doc/salome/gui/GEOM/whgdata/whlstt2.htm b/doc/salome/gui/GEOM/whgdata/whlstt2.htm index 548ea6dd6..7ec8d9f9f 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt2.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt2.htm @@ -1,60 +1,65 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-       Displaying/hiding objects
-       Changing Display Parameters
-    Creating geometrical objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+       Creating Basic Geometric Objects
+       Creating Primitives
+       Creating Complex Objects
+       Working with groups
+       Building by blocks
+       Sketcher
+       Creating Advanced Geometrical Objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt3.htm b/doc/salome/gui/GEOM/whgdata/whlstt3.htm index dab99dd51..80435d67b 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt3.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt3.htm @@ -1,64 +1,75 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-       Displaying/hiding objects
-       Changing Display Parameters
-          Display Mode
-          Color
-          Transparency
-          Isolines
-    Creating geometrical objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+       Creating Basic Geometric Objects
+          Point
+          Line
+          Circle
+          Ellipse
+          Arc
+          Curve
+          Vector
+          Plane
+          Working Plane
+          Local Coordinate System
+       Creating Primitives
+       Creating Complex Objects
+       Working with groups
+       Building by blocks
+       Sketcher
+       Creating Advanced Geometrical Objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt4.htm b/doc/salome/gui/GEOM/whgdata/whlstt4.htm index 96f046c94..53e8bf275 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt4.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt4.htm @@ -1,65 +1,70 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-       Creation of Basic Geometric Objects
-       Creation of Primitives
-       Generation of Complex Objects
-       Working with groups
-       Building by blocks
-       Sketcher
-       Creation of Advanced Geometrical Objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+       Creating Basic Geometric Objects
+       Creating Primitives
+          Box
+          Cylinder
+          Sphere
+          Torus
+          Cone
+       Creating Complex Objects
+       Working with groups
+       Building by blocks
+       Sketcher
+       Creating Advanced Geometrical Objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt5.htm b/doc/salome/gui/GEOM/whgdata/whlstt5.htm index 5046df32c..12c834bc5 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt5.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt5.htm @@ -1,75 +1,69 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-       Creation of Basic Geometric Objects
-          Point
-          Line
-          Circle
-          Ellipse
-          Arc
-          Curve
-          Vector
-          Plane
-          Working Plane
-          Local Coordinate System
-       Creation of Primitives
-       Generation of Complex Objects
-       Working with groups
-       Building by blocks
-       Sketcher
-       Creation of Advanced Geometrical Objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+       Creating Basic Geometric Objects
+       Creating Primitives
+       Creating Complex Objects
+          Extrusion
+          Revolution
+          Filling
+          Pipe
+       Working with groups
+       Building by blocks
+       Sketcher
+       Creating Advanced Geometrical Objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt6.htm b/doc/salome/gui/GEOM/whgdata/whlstt6.htm index 47dd557db..39a238c00 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt6.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt6.htm @@ -1,70 +1,72 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-       Creation of Basic Geometric Objects
-       Creation of Primitives
-          Box
-          Cylinder
-          Sphere
-          Torus
-          Cone
-       Generation of Complex Objects
-       Working with groups
-       Building by blocks
-       Sketcher
-       Creation of Advanced Geometrical Objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+       Creating Basic Geometric Objects
+       Creating Primitives
+       Creating Complex Objects
+       Working with groups
+       Building by blocks
+       Sketcher
+       Creating Advanced Geometrical Objects
+          Explode
+          Edge
+          Wire
+          Face
+          Shell
+          Solid
+          Compound
+    Viewing geometrical objects
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt7.htm b/doc/salome/gui/GEOM/whgdata/whlstt7.htm index f0c47132a..90cd66b4b 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt7.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt7.htm @@ -1,69 +1,64 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-       Creation of Basic Geometric Objects
-       Creation of Primitives
-       Generation of Complex Objects
-          Extrusion
-          Revolution
-          Filling
-          Pipe
-       Working with groups
-       Building by blocks
-       Sketcher
-       Creation of Advanced Geometrical Objects
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+       Viewing Geometrical Objects
+       OCC 3D Viewer
+       Display Mode
+       Color
+       Transparency
+       Isolines
+    Transforming geometrical objects
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt8.htm b/doc/salome/gui/GEOM/whgdata/whlstt8.htm index 922ca5f0e..582722826 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt8.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt8.htm @@ -1,72 +1,63 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-       Creation of Basic Geometric Objects
-       Creation of Primitives
-       Generation of Complex Objects
-       Working with groups
-       Building by blocks
-       Sketcher
-       Creation of Advanced Geometrical Objects
-          Explode
-          Edge
-          Wire
-          Face
-          Shell
-          Solid
-          Compound
-    Transforming geometrical objects
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+       Basic Operations
+       Boolean Operations
+       Transformation Operations
+       Blocks Operations
+       Repairing Operations
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whlstt9.htm b/doc/salome/gui/GEOM/whgdata/whlstt9.htm index 7ed28d7c7..59e42a136 100755 --- a/doc/salome/gui/GEOM/whgdata/whlstt9.htm +++ b/doc/salome/gui/GEOM/whgdata/whlstt9.htm @@ -1,63 +1,65 @@ - - - -Content - - - - - - - - - - -
-

- GEOM module
-    Introduction to GEOM
-    Importing/exporting geometrical objects
-    Managing geometrical objects
-    Creating geometrical objects
-    Transforming geometrical objects
-       Basic Operations
-       Boolean Operations
-       Transformation Operations
-       Blocks Operations
-       Repairing Operations
-    Using measurement tools
-    TUI Scripts
-

- -
-

-

- - - - + + + +Content + + + + + + + + + + +
+

+ Geometry module
+    Introduction to Geometry
+    Importing/exporting geometrical objects
+    Creating geometrical objects
+    Viewing geometrical objects
+    Transforming geometrical objects
+       Basic Operations
+          Partition
+          Archimede
+       Boolean Operations
+       Transformation Operations
+       Blocks Operations
+       Repairing Operations
+    Using measurement tools
+    TUI Scripts
+

+ +
+

+

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvf30.htm b/doc/salome/gui/GEOM/whgdata/whnvf30.htm index 33dae3be2..7cff7ce54 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvf30.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvf30.htm @@ -1,13 +1,13 @@ - - - -toc frame - - - - - - - - - + + + +toc frame + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvf31.htm b/doc/salome/gui/GEOM/whgdata/whnvf31.htm index a9128b803..91a985f9f 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvf31.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvf31.htm @@ -1,15 +1,15 @@ - - - -Index frame - - - - - - - - - - - + + + +Index frame + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvf32.htm b/doc/salome/gui/GEOM/whgdata/whnvf32.htm index ae872731a..bc2231fbf 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvf32.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvf32.htm @@ -1,15 +1,15 @@ - - - -search frame - - - - - - - - - - - + + + +search frame + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvf33.htm b/doc/salome/gui/GEOM/whgdata/whnvf33.htm index 9af2824d1..6c091d828 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvf33.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvf33.htm @@ -1,15 +1,15 @@ - - - -Glossary frame - - - - - - - - - - - + + + +Glossary frame + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvl31.htm b/doc/salome/gui/GEOM/whgdata/whnvl31.htm index 870e98ef4..e29abc01c 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvl31.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvl31.htm @@ -1,43 +1,43 @@ - - - -Index Letters - - - - - - - - - - - - + + + +Index Letters + + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvl32.htm b/doc/salome/gui/GEOM/whgdata/whnvl32.htm index 5927c3d7f..c76e9d162 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvl32.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvl32.htm @@ -1,72 +1,72 @@ - - - -Search Letters - - - - - - - - -

- # - A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z -

- - - - + + + +Search Letters + + + + + + + + +

+ # + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z +

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvl33.htm b/doc/salome/gui/GEOM/whgdata/whnvl33.htm index f3659d1c4..d6f20c33c 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvl33.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvl33.htm @@ -1,72 +1,72 @@ - - - -Glossary Letters - - - - - - - - -

- # - A - B - C - D - E - F - G - H - I - J - K - L - M - N - O - P - Q - R - S - T - U - V - W - X - Y - Z -

- - - - + + + +Glossary Letters + + + + + + + + +

+ # + A + B + C + D + E + F + G + H + I + J + K + L + M + N + O + P + Q + R + S + T + U + V + W + X + Y + Z +

+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvp30.htm b/doc/salome/gui/GEOM/whgdata/whnvp30.htm index 1a8036de8..0c9cb814b 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvp30.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvp30.htm @@ -1,16 +1,16 @@ - - - - Content Navigation Pane - - - - - - - - - + + + + Content Navigation Pane + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whgdata/whnvp31.htm b/doc/salome/gui/GEOM/whgdata/whnvp31.htm index fa146f1f8..87921c0b7 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvp31.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvp31.htm @@ -1,16 +1,16 @@ - - - - Index Navigation Pane - - - - - - - - - + + + + Index Navigation Pane + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whgdata/whnvp32.htm b/doc/salome/gui/GEOM/whgdata/whnvp32.htm index c334807b1..90697b01f 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvp32.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvp32.htm @@ -1,16 +1,16 @@ - - - - Search Navigation Pane - - - - - - - - - + + + + Search Navigation Pane + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whgdata/whnvp33.htm b/doc/salome/gui/GEOM/whgdata/whnvp33.htm index 8fb4636f0..8351bcbea 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvp33.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvp33.htm @@ -1,16 +1,16 @@ - - - - Glossary Navigation Pane - - - - - - - - - + + + + Glossary Navigation Pane + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whgdata/whnvt30.htm b/doc/salome/gui/GEOM/whgdata/whnvt30.htm index 35e6ef5b8..ec1bb840f 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvt30.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvt30.htm @@ -1,47 +1,47 @@ - - - -Content Navigation Tab - - - - - - - - - - - -
- -
- - - - + + + +Content Navigation Tab + + + + + + + + + + + +
+ +
+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvt31.htm b/doc/salome/gui/GEOM/whgdata/whnvt31.htm index 53dd7e91c..e17d82548 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvt31.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvt31.htm @@ -1,45 +1,45 @@ - - - -Index Navigation Tab - - - - - - - - - - - -
- -
- - - - + + + +Index Navigation Tab + + + + + + + + + + + +
+ +
+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvt32.htm b/doc/salome/gui/GEOM/whgdata/whnvt32.htm index 464a4cc4a..d63892533 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvt32.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvt32.htm @@ -1,45 +1,45 @@ - - - -Search Navigation Tab - - - - - - - - - - - -
- -
- - - - + + + +Search Navigation Tab + + + + + + + + + + + +
+ +
+ + + + diff --git a/doc/salome/gui/GEOM/whgdata/whnvt33.htm b/doc/salome/gui/GEOM/whgdata/whnvt33.htm index eb46f192b..af63a0257 100755 --- a/doc/salome/gui/GEOM/whgdata/whnvt33.htm +++ b/doc/salome/gui/GEOM/whgdata/whnvt33.htm @@ -1,45 +1,45 @@ - - - -Glossary Navigation Tab - - - - - - - - - - - -
- -
- - - - + + + +Glossary Navigation Tab + + + + + + + + + + + +
+ +
+ + + + diff --git a/doc/salome/gui/GEOM/whproj.htm b/doc/salome/gui/GEOM/whproj.htm index 821daea24..2549c9a7c 100755 --- a/doc/salome/gui/GEOM/whproj.htm +++ b/doc/salome/gui/GEOM/whproj.htm @@ -1,24 +1,24 @@ - - -project description - - - - - - - - - - + + +project description + + + + + + + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whproj.xml b/doc/salome/gui/GEOM/whproj.xml index 4bd4a8de7..10e2571f6 100755 --- a/doc/salome/gui/GEOM/whproj.xml +++ b/doc/salome/gui/GEOM/whproj.xml @@ -1,3 +1,3 @@ - - - + + + diff --git a/doc/salome/gui/GEOM/whxdata/whftdata0.xml b/doc/salome/gui/GEOM/whxdata/whftdata0.xml index f90fdae90..567a7c535 100755 --- a/doc/salome/gui/GEOM/whxdata/whftdata0.xml +++ b/doc/salome/gui/GEOM/whxdata/whftdata0.xml @@ -1,94 +1,87 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whxdata/whfts.xml b/doc/salome/gui/GEOM/whxdata/whfts.xml index 13723ae16..3146b8080 100755 --- a/doc/salome/gui/GEOM/whxdata/whfts.xml +++ b/doc/salome/gui/GEOM/whxdata/whfts.xml @@ -1,7 +1,7 @@ - - - - - - - + + + + + + + diff --git a/doc/salome/gui/GEOM/whxdata/whfwdata0.xml b/doc/salome/gui/GEOM/whxdata/whfwdata0.xml index 57b503e62..d03042aed 100755 --- a/doc/salome/gui/GEOM/whxdata/whfwdata0.xml +++ b/doc/salome/gui/GEOM/whxdata/whfwdata0.xml @@ -1,1278 +1,1335 @@ - - - 0,3,4,6,7,9,11,12,19,46,48,52,63,64,66,75,41,81,83, - 66, - 19, - 4, - 0,2,3,4,6,7,9,10,11,12,15,16,19,21,24,26,27,28,29,30,43,44,46,47,48,51,52,53,54,55,56,57,60,61,62,63,64,65,66,67,68,69,71,72,75,74,77,79,36,38,39,40,41,42,34,33,32,81,82,83,84,88,89, - 3,19,52,64,75,81, - 3,4,6,9,19,46,52,66,75,81, - 3,81, - 4, - 52, - 52, - 52, - 38, - 9, - 66, - 66, - 9,19,52,64,75, - 3,9,46,66,75, - 11, - 64, - 3, - 66,75, - 52, - 6,39,32,81, - 52,66, - 39,40,41,42,32, - 58,6,8,15,18,19,22,23,24,25,28,45,46,48,49,50,52,55,56,57,60,66,70,72,74,38,39,40,41,42,34,33,32,81,82,84,85,88, - 3,7,9,19,46,64,66,75,81, - 3,4,6,48,52,66,81, - 81, - 11, - 81, - 52, - 3,6,7,64,81, - 46,52,66,75, - 6,44,66,72,36,39,41,34,33,32,81, - 39,40,41,42,32, - 42, - 1,2,6,8,11,15,19,21,46,48,52,56,62,63,66,72,74,39,40,41,42,33,32,81,82,85, - 3,9,11,19,52,64,66,75,81, - 46,75, - 52, - 11, - 66, - 52, - 7,64,66,81, - 12,15,22,44,51,60,62,63,66,72,78,35,36,38,39,40,41,34,33,32,85,87,89, - 39,32, - 42, - 58,46,48,52,56,72,74,39,41,33,81, - 7,9,19,46,64,66,81, - 66, - 9,64,66, - 0,3,11,19,44,46,48,52,63,66,72,75,74,36,37,41,81, - 3,6,9,11,19,46,52,66,75,81,83, - 4, - 7,64,66, - 58,52,72,38,41, - 19,66,81, - 66, - 46,52,66,72,41, - 3,9,46,64,66,75,81, - 52,72,41, - 52,66,75,81, - 46,52,72,74,41, - 74, - 74, - 54, - 74, - 83, - 8,17,29,30,50,77,42, - 0,72,41,32, - 0,16,41, - 72,41, - 16,48,37,41,89, - 0,3,4,6,7,9,19,46,48,64,66,75,41,81,89, - 48,89, - 3,4,6,7,9,11,19,46,48,64,66,75,81, - 6,66, - 41, - 8,20,25,29,30,46,73,76,77,36,34,86, - 39, - 8,15,21,22,24,51,54,60,62,63,74,77,39,84,85,88, - 66, - 58,10,27,53,54,55,68,71,74,79,41,42,82, - 8,10,57,59,61,36,39,42,81,82, - 33, - 48, - 55,66,67,68,72,74,36,41,42,81, - 23,29,50,62,63,77, - 2,54,60,68,72,41,82, - 51,41,32,81,89, - 89, - 19,81, - 10,39, - 59,42, - 72,41, - 72,41, - 1,3,19,46,66,75,74,32,81, - 19, - 19, - 2,4,39, - 52, - 0,1,2,58,8,10,13,14,15,16,18,20,21,22,23,24,25,26,27,28,29,30,43,44,45,47,49,50,51,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,36,38,39,40,41,42,34,33,32,82,84,85,86,88,89, - 55,67,36,81, - 35, - 35, - 58,51,32, - 0,58,16,74,78,79,80,35,37,41,89, - 8,51,32,82, - 19,21,24,51,53,55,57,67,68,36,38,40,42,32,81, - 3,22,32, - 21,24,29,55,61,66,67,69,72,36,40,41,42,82,84, - 61,36, - 29,36, - 1,2,3,4,15,22,26,31,50,51,52,60,62,63,74,38,39,34,32,85,88, - 52,38, - 52, - 25, - 66,72,74,41, - 66, - 10, - 58,54, - 22, - 3,22,72,41,32, - 54, - 58,6,9,5,28,31,52,56,65,38,39, - 7,18,23,45,31,70,38,34,33, - 8,21,56,35, - 66, - 9,46,52,38, - 13,66,71,79,41, - 13,66,80,41, - 52,38, - 0,4,58,6,8,11,12,13,16,17,23,28,48,52,64,66,72,74,80,36,37,38,39,40,41,42,34,32,81,83,86,89, - 6, - 6, - 52,64,66, - 52,64,66, - 64, - 65,39, - 31,66,37, - 43,51,35,37,32,86, - 72,41, - 72,41, - 58,6,9,5,20,25,30,31,60,65,73,76,39,34,86, - 51,71,79,41,32,86,89, - 58, - 46,75, - 31, - 32,88, - 58,51,56,72,80,41,32, - 37, - 8,15,21,26,52,54,55,74,77,38,40,42,32,84, - 27, - 69,42, - 21,24,69,40, - 89, - 6, - 10,39,81, - 81, - 81, - 81, - 81, - 11,12,17,49,83,87, - 6,13,14,28,30,52,66,80,38,39,41, - 6, - 6, - 53,54,55,68,79,41,42,82, - 52,38, - 52,66,38, - 22, - 28,51,35,37,39, - 3,15,74,32, - 3, - 3, - 12,17,35,37,87,89, - 13,16,66,72,76,41,34,89, - 16,66,41, - 13,66,41, - 16,41, - 52, - 54, - 47,41, - 21,24, - 11,12,17,87, - 0,1,2,58,8,10,12,13,14,15,16,17,18,20,21,22,24,25,26,27,28,29,30,43,44,45,47,50,51,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,35,36,38,39,40,41,42,34,33,32,82,83,84,85,86,87,89, - 7,10,16,18,41,33,81, - 19,29,44,31,61,67,36,39,33, - 3,19,44,74,42,32,82, - 58,38, - 58,6,18,19,20,23,27,28,45,46,47,52,55,57,59,66,70,38,39,41,42,34, - 27,29,61,67,36, - 2,38,39, - 21,64,66,40, - 38, - 38, - 64, - 64, - 37,89, - 72,41, - 10,30,73,38,39,34,86, - 38, - 81, - 16,47,38,41, - 38, - 58, - 58,76,40,34, - 22,31,61,33, - 39,40,41,42,32, - 0,6,14,16,65,39,41, - 48,37, - 72,41, - 72,41, - 72,41, - 72,41, - 16,66,41, - 72,41, - 52, - 8,21,24,27,51,52,54,63,74,77,38,40,42,32,81,82,84,85,88, - 53,54,68,42,82, - 8,9,40, - 72,41, - 2,13,22,25,28,36,39,40,41,34,32, - 66, - 74, - 33, - 1,2,3,4,58,6,7,8,9,10,15,16,19,20,21,22,24,25,26,27,29,30,43,44,45,46,48,50,51,52,53,54,55,61,62,63,64,66,67,68,69,70,73,75,74,76,77,35,36,38,39,40,41,42,34,32,81,82,84,85,86,88,89, - 3,4,6,7,9,11,19,46,48,64,66,75,81, - 48,89, - 1,3,8,15,16,19,20,21,22,24,25,26,29,30,44,46,48,31,50,61,62,63,64,66,67,73,76,77,36,39,41,84,85,86,89, - 51, - 81, - 81, - 54, - 8,29,50,74,77,35, - 3,22,44,72,74,36,41,32, - 72,41, - 72,41, - 72,41, - 7,18,23,60,66,72,39,41,33, - 66, - 7,21,24,64,66,40,81, - 19, - 72,41, - 10,66, - 10,39,81, - 10,39,81, - 38, - 66, - 63,74,89, - 1,8,10,15,21,22,24,26,27,28,29,43,44,50,51,55,56,57,61,62,63,67,68,69,72,74,77,37,39,40,41,42,32,82,84,85,88,89, - 79,38,41, - 61,72,36,41, - 2,39, - 38, - 44,67,72,74,36,41, - 60,39,89, - 2,39, - 56,39, - 52, - 58,12,52,75,74,35,36,38,39,40,41,42,34,32, - 89, - 72,41, - 31, - 74, - 13,71,79,41, - 72,41, - 40, - 0,58,12,13,16,23,72,74,80,36,37,38,39,40,41,42,34,32,83,86,89, - 35, - 48, - 12,53,35,38,40, - 8,10,24,29,55,36,38,39,40, - 55, - 55,57,42, - 57,42, - 57,42, - 2,15,21,26,29,51,55,56,57,67,68,74,36,39,40,42,32,84, - 56,39, - 56,39, - 56,39, - 56,39, - 56,39, - 56,39, - 56,39, - 3,4,6,7,9,11,12,17,19,46,48,49,64,66,71,75,79,35,37,38,41,32,81,83,87,89, - 35, - 35, - 47,52,59,38,41,42, - 0,66,72,41, - 0,66,41, - 54, - 48, - 8,16,29,57,77,41,42, - 12,55,56,57,74,83, - 89, - 72,41, - 8,52,74,42,82,85, - 8,52,74,42,82,85, - 8,52,42,82,85, - 35, - 58, - 58, - 58, - 58, - 89, - 0,1,58,8,9,10,13,15,16,19,22,25,26,27,29,43,44,46,50,52,61,63,65,66,67,72,73,74,36,38,39,41,34,32,81,85,86,87, - 66, - 66, - 9, - 9, - 9, - 9, - 0,41, - 89, - 38, - 38, - 58, - 16,30,74,35,36,38,40,41,34,33,32,89, - 58, - 3,26,32, - 52,66, - 79,80,41, - 38, - 1,16,29,54,66,74,41,42,32,81,82,85, - 32,89, - 38, - 1,58,8,15,20,21,22,24,25,26,27,29,30,44,50,51,61,62,63,67,73,74,76,77,36,40,34,32,84,85,86,88,89, - 21,74, - 35, - 35, - 35, - 13,48,38,41, - 27,72,41,34, - 0,1,2,58,8,10,12,13,14,15,16,17,18,20,21,22,23,24,25,26,28,29,30,43,44,45,47,49,50,51,53,54,55,56,57,59,60,61,62,63,65,66,67,68,69,70,71,72,73,74,76,77,78,79,80,36,37,39,40,41,42,34,33,32,82,83,84,85,86,87,89, - 80,41, - 62,74,89, - 37, - 6,5,27,28,46,39,34, - 31,37, - 37, - 38, - 28,39, - 61,67,36, - 29,36, - 46,75, - 66, - 81, - 81, - 58, - 66, - 58, - 58, - 58, - 58, - 58, - 3,58,9,10,14,16,19,27,28,29,30,43,44,46,47,48,52,56,59,60,61,62,66,67,72,73,75,74,78,80,36,38,39,41,42,34,32,81,88, - 66, - 66, - 10,19,46,39, - 10,19,46,39, - 46, - 48, - 38, - 38, - 69,42,81, - 52,66, - 13,41, - 32, - 17,19,44,51,36,37,32,87, - 79,36,41, - 10,43,39,81, - 81, - 53,62,63,82,88,89, - 8,15,21,24,25,51,53,54,56,57,60,62,63,75,77,39,40,42,34,33,32,82,84,85,88, - 72,41, - 72,41, - 66,72,41, - 38, - 66, - 75,74,35,38,34,33,83,89, - 31,37, - 58,9, - 13,14,66,71,79,41, - 31,34,81, - 58, - 74,89, - 7,11,45,33, - 11, - 16,41, - 58,33, - 29,44,61,36, - 29,44,31,61,67,36, - 3,4,6,7,9,11,12,19,46,48,31,52,64,65,66,75,35,36,37,38,39,40,42,34,33,32,81, - 0,1,2,58,8,10,13,14,15,16,18,20,21,22,23,24,25,26,27,28,29,30,43,44,45,47,50,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,36,38,39,40,41,42,34,32,82,84,85,86,89, - 1,58,15,20,22,25,26,29,30,44,50,61,62,63,67,73,76,85,86, - 3,12,18,46,31,55,35,36,37,38,39,40,41,42,34,33,32,87,89, - 66,72,41, - 0,1,2,3,4,58,6,7,8,9,10,11,13,15,16,18,19,20,21,22,24,25,26,27,28,29,30,43,44,45,46,47,48,50,51,52,53,54,55,56,57,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,75,74,76,77,78,79,80,36,38,39,40,41,42,34,33,32,81,82,84,85,86,89, - 6,52,66,38,34,81, - 66, - 6, - 13,66,41, - 14,66,41, - 89, - 66, - 48,66,34,81, - 6, - 3,4,6,7,9,11,12,17,19,46,48,52,64,66,75,81,83,87, - 15,26,62,37,32, - 3,6,9,10,14,19,24,27,28,30,43,46,47,50,55,59,63,66,75,38,39,41,42,34,32,81,84, - 51,54, - 6,47,52,60,66,38,39,41, - 35, - 27,52,55,38, - 6,48,31,65,39,89, - 89, - 48, - 39, - 32, - 89, - 72,73,41,34, - 7,21,24,29,66,36,40,81, - 89, - 9, - 58,9,56,39, - 58, - 35, - 13,38,41, - 66,79,41, - 86, - 38, - 19,48,66,35, - 38, - 38, - 38, - 38, - 38, - 38, - 38, - 38, - 38, - 0,12,14,16,17,27,56,66,78,79,80,35,39,41,34,81,83,87,89, - 3, - 4, - 81, - 3, - 4,6,66,81, - 6, - 6, - 64,66, - 64,66, - 64, - 81, - 81, - 81, - 81, - 3, - 3, - 7, - 6,19,66, - 64, - 64, - 81, - 81, - 7,66, - 66, - 7,81, - 66, - 19,46,66, - 9, - 9, - 9, - 9, - 3, - 3,66,75, - 66, - 19,46, - 19,46, - 46, - 19, - 81, - 81, - 7, - 66, - 48, - 66, - 3, - 3, - 3, - 6, - 81, - 81, - 81, - 81, - 66, - 3, - 3, - 3,9, - 3, - 3,9, - 3,9, - 3,9,81, - 4, - 4, - 4, - 19, - 4,81, - 3, - 3, - 3, - 3, - 81, - 81, - 19, - 19, - 3, - 3, - 3, - 9, - 9, - 9, - 66, - 19, - 81, - 81, - 81, - 81, - 7, - 66, - 66, - 46, - 75, - 75, - 46, - 9, - 9, - 7, - 64, - 64, - 64, - 64, - 64, - 81, - 81, - 81, - 81, - 81, - 3, - 3, - 3, - 19, - 81, - 3, - 19,46,66, - 66, - 66,81, - 81, - 81, - 0,13,16,21,30,48,52,60,66,72,79,80,38,39,41,34, - 31,37, - 53,42,81, - 37, - 3,4,6,7,9,11,19,46,48,31,52,64,66,75,35,37,38,81, - 37, - 66, - 3,4,6,7,9,11,19,46,48,52,64,66,75,81, - 30, - 6, - 59,37,42, - 48, - 16,41, - 18,35, - 27,89, - 10,27,60,66,39, - 57,63, - 52,38, - 38, - 53,54,55,68,69,42,82, - 38, - 16,41, - 60,39, - 21, - 56,39, - 28,56,39, - 72,41, - 28,39, - 58, - 66,80,41, - 3, - 22, - 60,39, - 60,39, - 58,31, - 52,66,72,41, - 83, - 0,41, - 16,41, - 12, - 49, - 46, - 3,19,30,75, - 66, - 52,66, - 44,36, - 16,41, - 52,38, - 52,38, - 52,38, - 58, - 53,54,68,42,82,89, - 89, - 66, - 46,75, - 25,51,34,32, - 51,32, - 22,32, - 89, - 54, - 66, - 0,52,74,38,41, - 72,41, - 1,15, - 60,39, - 2,3,50,74,39,32,89, - 3, - 3, - 74, - 3,10,13,14,16,20,22,27,30,44,48,60,65,66,71,72,73,74,76,78,79,80,36,39,41,34,32,81,86,89, - 6, - 10,39, - 78,41, - 78,41,34, - 27, - 60,39, - 60,39, - 60,39, - 20,22,60,71,73,76,39,41,34,32,86, - 39, - 60,39, - 79,41, - 43, - 51,54,59,74,42,32,81, - 6, - 63,32, - 51,54,37,42,32,81, - 54, - 74,80,41, - 0,1,2,58,8,5,10,13,14,15,16,18,20,21,22,23,24,25,26,27,28,29,30,43,44,45,47,50,51,52,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,35,36,38,39,40,41,42,34,32,82,84,85,86,88,89, - 89, - 26,40,32,84, - 6,7,10,52,56,57,60,66,39,42,81,82,89, - 6, - 1,3,19,46,66,75,32,81, - 3,22,32, - 6,28,39, - 11,33, - 8,11,52,64,66,40,81, - 6,8,52,64,66,81, - 4,8,48,64, - 52,38, - 81, - 10,81, - 10,39,81, - 10,39,81, - 3,15,32, - 3,15, - 7,18, - 6,19,20,52,66,34, - 21,64,66,40, - 21,64, - 7,66, - 7,24,66,40,81, - 24, - 9,19,25,46,66,34, - 3,26,32, - 3,19,30,46,66,75,34,81, - 30,46, - 19,44,36, - 43,39,81, - 43,81, - 7,45, - 47,52,66,41, - 4,60, - 58,9, - 58,9, - 3,22,32, - 3,50,32, - 3,50, - 51,32,81, - 53,81, - 53,42,81, - 53,81, - 55, - 55, - 55,42, - 55,42, - 6,56,39, - 6,56,39, - 57,42,81, - 57,42,81, - 59,42,81, - 4,60,39, - 19,61,36, - 3,4,62,32, - 3,62, - 3,62,81, - 3,22,32, - 54,42,81, - 19,29,46,36, - 19,29,66,81, - 58,9, - 58,9, - 58,9, - 19,67,36, - 66,68,42,81, - 69,42,81, - 7,70, - 66,71,41, - 46,73,34, - 46,75,74, - 75, - 46,76,34, - 6,7,11,64,77,40, - 64, - 64,40,84, - 64,84, - 19,42,81,82, - 81,82, - 81,82, - 3,7,19,46,64,66,75,32,81,85, - 3,4,19,85, - 3,4,6,7,9,19,46,48,52,63,64,66,75,32,81, - 3,63,32, - 3,63,32, - 3,19,46,66,75,34,81,86, - 32,89, - 52,38, - 60,39, - 52,66,81, - 52,38, - 28,44,52,72,36,39,41, - 19, - 44,36, - 28,72,36,38,39,41, - 28,44,47,72,39,41, - 28,39, - 72,41, - 72,41, - 12,59,63,74,42,87, - 38, - 52,38, - 37, - 58, - 0,1,2,58,8,5,10,12,13,14,15,16,17,18,20,21,22,23,24,25,26,27,28,29,30,43,44,45,47,49,50,51,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,35,36,37,38,39,40,41,42,34,32,82,84,85,86,87,88,89, - 72,41, - 2,58,39, - 2,4,39, - 34, - 63,32, - 28,44,52,36,38,39, - 52, - 19, - 44,36, - 52,38, - 28,30,52,36,38,39, - 28,44,39, - 28,39, - 26,40,32,84, - 53,42,81, - 81, - 81, - 81, - 0,11,12,16,72,41,87, - 2,31,39, - 16,54,41,42,32, - 41,42, - 54,42,81, - 31,35, - 52,38, - 54,57,42, - 89, - 6,5,55,56,57,39,42,81, - 81, - 81, - 65,39, - 52,55,57,79,38,41,42, - 0,1,2,58,8,10,15,16,18,20,21,22,23,24,25,26,29,30,43,44,45,47,50,51,53,54,55,56,57,59,60,61,62,63,67,69,70,71,72,73,76,77,78,79,80,36,37,39,40,41,42,34,32,82,84,85,86,88,89, - 8,29,50,77, - 27, - 19,44,36, - 52, - 52, - 72,41, - 55,56,57,39,42, - 55,57,42, - 55,57,42, - 56,39, - 56,39, - 52, - 52, - 8,10,27,29,30,43,44,55,57,61,67,68,69,77,82, - 10,43,72,74,35,38,41, - 16,41, - 59,42, - 72,41, - 1,58,8,15,16,20,21,22,24,25,26,27,29,30,44,50,51,61,62,63,67,73,74,76,77,36,40,41,34,32,81,84,85,86,88,89, - 52, - 52, - 22,32, - 13,41, - 52, - 3,15,26,29,59,62,36,42,32,84, - 21, - 30, - 58, - 28,44,49,55,56,57,59,66,71,72,79,36,39,41,42,81, - 56,39, - 39, - 1,2,3,4,6,7,9,10,12,15,17,18,19,20,22,25,26,27,29,30,43,44,46,48,31,50,51,53,54,55,59,61,62,63,64,65,66,67,68,73,75,76,80,35,36,37,38,39,40,41,42,34,33,32,81,82,85,86,87,89, - 27,52, - 0,10,12,16,43,78,79,80,35,41,89, - 13,41, - 89, - 59,42,81, - 51,52,66,32,89, - 63, - 0,16,23,54,55,56,57,62,63,66,72,74,35,39,41,42,32,81,88, - 83, - 13,16,66,37,41,89, - 13,66,41, - 0,1,2,4,58,6,7,8,10,13,14,15,16,18,21,22,23,24,26,27,28,29,43,44,45,47,31,50,53,54,55,56,57,59,60,61,62,63,65,66,67,68,69,70,71,72,74,77,78,79,80,35,36,39,41,42,33,81,82,84,85,89, - 66,72,41, - 37, - 8,40, - 31, - 5,12,87, - 72,41, - 58,32, - 8,21,24,51,77,40,32,84,85, - 66, - 0,16,53,54,68,41,42,82, - 0,1,2,58,8,10,13,14,15,16,17,18,20,21,22,23,24,25,26,28,29,30,43,44,45,47,50,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,38,33,82,83,84,85,86,87,89, - 60,39, - 51,74,32, - 51,32, - 21,24,51,74,32, - 64, - 6, - 6, - 6, - 3, - 3,4,19,46,48,64,66,81, - 3,7,9,19,64,66,75,81, - 9, - 3, - 9, - 9, - 9, - 3,7,9,19,64,66,75,81, - 4,48, - 3,9,19,66,75,81, - 3,9,19,81, - 3,9,19,81, - 3, - 9,19, - 9,19, - 64, - 9,19, - 9, - 8,50,51, - 0,16,63,72,41,34,32, - 4,11,12,17,44,66,72,74,36,41,32,83,87, - 0,41, - 18,21,40, - 4,60,39, - 4, - 4, - 4, - 22,50,55,62,74,32, - 19,61,36, - 61,36, - 42, - 4,27,60,39,81, - 74, - 55,66,81, - 54, - 19,61,36, - 54, - 2,3,4,53,60,62,74,39,42,32,81,88,89, - 30,75,74,34,32,81,88, - 3, - 3, - 3, - 89, - 37, - 2,39, - 0,1,3,4,58,8,9,15,16,19,21,22,24,25,26,29,46,48,50,51,52,53,55,59,62,63,66,69,72,75,74,77,38,40,41,42,32,81,82,84,85,89, - 1,3,8,9,15,25,29,50,62,32,82,85, - 1,3,8,9,15,25,29,50,62,32,82,85, - 1,3,9,15,62,32, - 3,9, - 3, - 52,38, - 3,22,32, - 12,17,35,87, - 0,63,41,32,81,88, - 30, - 72,41, - 6,22,65,72,35,38,39,41, - 66,71,41, - 74, - 51,32, - 51, - 32, - 74, - 8,21,24,31,64,77,40,84, - 52,66,38, - 19,29,46,66,36,81, - 81, - 46,81, - 19, - 19, - 72,41, - 16,66,72,78,39,41, - 66,72,41, - 2,10,16,18,23,28,43,45,53,55,56,57,59,60,65,68,69,70,71,72,78,81,82, - 48, - 55,88, - 52, - 6,65,39, - 6,65,39, - 12,52,38, - 0,1,2,58,8,10,13,14,15,16,17,18,20,21,22,23,24,25,26,28,29,30,43,44,45,47,50,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,33,82,83,84,85,86,87,89, - 66, - 2,39, - 3,19,46,66,81, - 81, - 19,46,81, - 3,19,46,66,81, - 66, - 38, - 3,4,19,46,66,81, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 9, - 58,9,62,38,32, - 43,46,75, - 72,41, - 89, - 3,10,15,21,24,26,43,74,77,39,40,32,81,84, - 3,21,26,40,32,84, - 7,21,64,66,40,81, - 21,64,40, - 64, - 26,40,32,84, - 26,40,32,84, - 48,52,66, - 0,27,31,37,41,83, - 72,41, - 35, - 60,39, - 51,63,32, - 63,32, - 74, - 81, - 12,87, - 87, - 48,53,54,66,68,72,78,79,80,41,42,82,89, - 48,89, - 60,39, - 0,13,14,16,47,31,66,71,72,78,79,80,41, - 55,57,42, - 62,32, - 34, - 72,35,37,41, - 72,41, - 72,41, - 66, - 47,74,41, - 72,41, - 0,1,2,4,58,6,7,8,10,13,14,15,16,18,20,21,22,23,24,25,26,27,28,29,30,43,44,45,47,50,53,54,55,56,57,59,60,61,62,63,65,66,67,68,69,70,71,72,73,74,76,77,78,79,80,36,38,39,40,41,42,34,32,81,82,84,85,86,89, - 72,41, - 14,41,34, - 14,27,28,52,38,39,41,34,89, - 55,68,42, - 19,67,72,36,41, - 12,17,54,35,87, - 81, - 81, - 55,67,68,36,42,81, - 55,66,68,42,81, - 52,66, - 13,15,16,19,56,66,69,78,79,80,39,41,42,34,32,89, - 18,45,70, - 18,45,70, - 3,4,6,7,9,11,19,46,48,31,52,64,66,75,81,89, - 55,72,74,41,81,89, - 72,41, - 38, - 37, - 69,42,81, - 0,1,2,58,8,10,13,14,15,16,17,18,20,21,22,23,24,25,26,28,29,30,43,44,45,47,50,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,38,33,82,83,84,85,86,87,89, - 87, - 37, - 8,15,21,24,51,53,54,56,57,60,62,63,75,77,39,40,42,33,82,84,85,88, - 2,7,70,39,33, - 66, - 72,74,41, - 0,1,2,4,8,5,10,12,13,14,15,16,17,18,20,21,22,23,24,25,26,27,28,29,30,43,44,45,47,48,50,51,53,54,55,56,57,59,60,61,62,63,65,66,67,68,69,70,71,72,73,74,76,77,78,79,80,35,36,37,38,39,40,41,34,32,82,84,85,86,87,88,89, - 43,74,39,32,88,89, - 60,39, - 33, - 22,29,61,67,36,32, - 0,12,16,28,30,46,55,59,63,39,41,42,32,88, - 11,12,17, - 3,4,6,7,9,11,12,19,46,64,66,75,81,87, - 3,11,12,46,75,83, - 66,71,41, - 6,48,66,35, - 12,87, - 0,2,4,10,12,13,14,16,18,20,23,27,29,43,44,45,47,48,31,49,52,53,54,55,57,59,60,61,65,66,67,68,69,70,71,72,78,79,80,35,36,38,39,41,42,34,81,82,83,89, - 38,33, - 38,33, - 19, - 27, - 41, - 43,46,48,66,39,81,89, - 81, - 81, - 14,41, - 14,20,46,59,73,76,41,42,34,87, - 58,29,46,59,61,67,73,76,36,42,34, - 63,86,89, - 12,17,87, - 30, - 29,50,78,79,38,41, - 38, - 51,32, - 62,32, - 59,42, - 62, - 51, - 55,56,57, - 30, - 58,9, - 10,62,72,39,41,32, - 46,75,74, - 46, - 46,75, - 46,75, - 46, - 89, - 72,41,32, - 30,54, - 58,8,9,21,24,27,29,46,56,59,61,67,76,77,36,39,40,42,34,84, - 9, - 9, - 32, - 27, - 67, - 15,22,62,63,38,32,85, - 0,8,10,16,43,51,56,66,72,80,39,41,32,81, - 58, - 0,68,41,42, - 6,7,11,64,77,40,81, - 64, - 64, - 64, - 3,22,32, - 0,72,41, - 72,41, - 72,41, - 72,41, - 72,41, - 52, - 58, - 17, - 1,29,54,74,42,32,82,85, - 31,55,57,37,42, - 57,42, - 57,42, - 74, - 72,41, - 3,4,6,7,9,19,46,64,66,75,35,81, - 27,66,79,41,34,89, - 66, - 48, - 5,38,41,34, - 27,39,34,89, - 27,34, - 27, - 27,46,48,66,81, - 27, - 89, - 27, - 52, - 66, - 66,78,79,80,41, - 66,78,41, - 66,79,41, - 66,80,41, - 30,44,52,59,72,38,41,42,81, - 72,41, - 72,41, - 81, - 53,42,81, - 53,40,42, - 21,24,51,54,77,42,32,81,88, - 8,29,48,77, - 74, - 28,74,39, - 58, - 75,74, - 54,42, - 8,27,72,78,41,86,89, - 54,42, - 74, - 47,66,41, - 54,42, - 47,41, - 8, - 1,3,15,19,22,46,51,53,62,63,75,81,88, - 83, - 22,55,57,63,42,81, - 72,41, - 89, - 52, - 19,44,36, - 19,44,36, - 16,44,47,52,66,72,36,38,41, - 72,41, - 66,72,41, - 52,60,38, - 6, - 6, - 64,40,84, - 64, - 64, - 64, - 81, - 81, - 6,18,56,69,39,42,81, - 6, - 6,5,10,43,31,53,54,55,56,57,59,68,69,39,42,81,82, - 55,57,59,42,81,82, - 55,56,57,39,42,81,82, - 81, - 81, - 81, - 11,12,83, - 83,87, - 32, - 3,4,62,32, - 0,16,60,66,38,39,41, - 21, - 30, - 46,75, - 0,1,2,58,8,10,12,13,14,15,16,17,18,20,21,22,23,24,25,26,27,28,29,30,43,44,45,47,50,51,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,35,36,38,39,40,41,42,34,33,32,82,83,84,85,86,87,89, - 38, - 0,3,4,58,8,9,10,14,18,19,21,25,45,46,47,48,54,55,56,57,60,75,77,38,39,40,41,42,81,84,88,89, - 22,27,28,60,72,74,38,39,40,41,34,33,89, - 34, - 16,41, - 48, - 12,17,21,35,39,40,87, - 32, - 6,48,66, - 2,58,16,27,28,44,31,54,56,72,74,80,35,36,38,39,41,42,34,33,32,83,89, - 0,1,2,58,8,10,13,14,15,16,17,18,20,21,22,23,24,25,26,28,29,30,43,44,45,47,50,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,71,72,73,74,76,77,78,79,80,33,82,83,84,85,86,87,89, - 7,64,66,81, - 58, - 58, - 58, - 58, - 0,41, - 52,66,38, - 38, - 0,2,8,10,16,21,24,29,43,47,49,51,52,55,57,59,62,66,67,71,72,74,77,36,38,39,40,41,42,32,82,84,85, - 27, - 72,41, - 3,4,7,15,19,21,24,26,29,46,50,51,53,55,57,62,64,66,67,68,75,74,36,40,42,32,81,82,84,85,88, - 3,75, - 3,19, - 19, - 19, - 3,19, - 19, - 19, - 19, - 3,4,7,15,16,19,21,24,25,26,29,52,53,61,62,63,64,66,67,69,77,36,38,40,41,42,34,32,81,84, - 63, - 25,34, - 25,34, - 38, - 38, - 1,3,58,6,8,9,16,19,25,27,46,48,50,64,66,75,40,41,42,34,32,81,82,85, - 58,8,29,30,50,74,77,37,42, - 0,10,12,16,43,51,78,79,80,35,38,41,32,86,87,89, - 35, - 35, - 12,35, - 52,38, - 81, - 81, - 81, - 35, - 81, - 81, - 3,19,46,66,81, - 4, - 81, - 66, - 66,34, - 2,39, - 2,4,39, - 8,27,29,50,53,55,77,89, - 2,4,39, - 75, - 52, - 52,38, - 38, - 13,19,52,41,87, - 30,38,34, - 31, - 1,2,58,8,10,15,18,20,21,22,23,24,25,26,27,28,29,30,43,44,45,50,51,53,54,55,56,57,59,60,61,62,63,65,67,68,69,70,72,73,74,76,77,37,39,41,42,32,82,84,85,86,89, - 3,58,13,16,19,27,29,30,46,52,61,66,67,75,74,79,80,36,41,34,81,86, - 66, - 66, - 19, - 19, - 12,87, - 27,37, - 16,49,41, - 66, - 31,55,72,74,35,41,32,88,89, - 74, - 46,75, - 3,8,26,51,63,74,77,38,32, - 8,40, - 8,40, - 51,32, - 51,32, - 51,32, - 52,38, - 52,38, - 74, - 32,88, - 6, - 6, - 3,8,26,51,63,74,77,38,32, - 8,40, - 8,40, - 51,32, - 51,32, - 51,32, - 52,38, - 52,38, - 17,44,71,79,37,38,41,88,89, - 51, - 6, - 6, - 2,3,8,51,63,77,38,39,32, - 8,40, - 8,40, - 21, - 52,38, - 52,38, - - + + + 0,3,4,5,6,8,10,17,36,39,43,45,55,56,58,64,67,73,75, + 58, + 17, + 4, + 0,2,3,4,5,6,8,9,10,13,14,17,19,22,24,25,26,27,28,33,34,36,38,39,42,43,44,45,46,47,48,52,53,54,55,56,57,58,59,60,61,63,64,66,67,69,71,30,73,74,75,76,81,82, + 3,17,43,56,67,73, + 3,4,5,8,17,36,43,45,58,67,73, + 3,73, + 4, + 43, + 43, + 43, + 32, + 8, + 58, + 58, + 8,17,43,56,67, + 3,8,36,58,67, + 10, + 56, + 3, + 58,64,67, + 43, + 5,73, + 43,58, + 49,5,7,13,16,17,20,21,22,23,26,35,36,39,40,41,43,46,47,48,52,58,62,66,32,30,73,74,76,77,81, + 3,6,8,17,36,56,58,67,73, + 3,4,5,39,43,45,58,73, + 73, + 10, + 73, + 43, + 3,5,6,56,73, + 36,43,58,67, + 5,34,58,64,30,73, + 1,2,5,7,10,13,17,19,36,39,43,47,54,55,58,66,30,73,74,77, + 3,8,10,17,43,56,58,67,73, + 36,67, + 43, + 10, + 58, + 43, + 6,56,58,73, + 13,20,34,42,50,52,54,55,58,64,70,32,30,77,78,80,82, + 49,36,39,43,47,66,30,73, + 6,8,17,36,56,58,73, + 58, + 8,56,58, + 0,3,10,17,34,36,39,43,55,58,66,67,31,73, + 3,5,8,10,17,36,43,58,67,73,75, + 4, + 6,56,58, + 49,43,32, + 17,58,73, + 58, + 36,43,58, + 3,8,36,56,58,67,73, + 43, + 43,58,67,73, + 36,43,66, + 64,66, + 50,66, + 66, + 75, + 50,78, + 7,15,27,28,41,69, + 0, + 0,14, + 14,39,31,82, + 0,3,4,5,6,8,17,36,39,56,58,67,73,82, + 39,82, + 3,4,5,6,8,10,17,36,39,56,58,67,73, + 5,58, + 7,18,23,27,28,36,65,68,69,79, + 7,13,19,20,22,42,45,52,54,55,66,69,76,77,81, + 58, + 49,9,25,44,45,46,50,60,63,64,66,71,74,78, + 7,9,45,48,51,53,73,74, + 30, + 39, + 45, + 46,58,59,60,64,66,73, + 21,27,41,54,55,69, + 2,52,60,64,74, + 42,73,82, + 78,82, + 17,73, + 9,64, + 51, + 64,78, + 64, + 1,3,17,36,58,66,67,73, + 17, + 17, + 2,4, + 43,50, + 0,1,2,49,7,9,13,14,16,18,19,20,21,22,23,24,25,26,27,28,33,34,35,38,40,41,42,44,45,46,47,48,51,52,53,54,55,57,59,60,61,62,63,65,66,68,69,70,71,72,30,74,76,77,79,81,82, + 46,59,73, + 49,42,78, + 0,49,14,50,66,70,71,72,31,82, + 7,42,50,74, + 17,19,22,42,44,45,46,48,59,60,32,73, + 3,20,64, + 78, + 19,22,27,46,50,53,58,59,61,64,74,76, + 53, + 27,50, + 1,2,3,4,13,20,24,37,29,41,42,43,52,54,55,66,32,77,81, + 43,32, + 43, + 23, + 58,64,66, + 58, + 9, + 49, + 20, + 3,20,64, + 78, + 49,5,8,26,37,29,43,47,57,32, + 50,78, + 6,16,21,35,37,29,62,32,30, + 7,19,47,64, + 58, + 8,36,43,32, + 11,58,63,71, + 11,58,72, + 43,32, + 4,49,5,7,10,15,21,26,39,43,56,58,64,66,72,32,31,73,75,79,82, + 5, + 5, + 43,56,58, + 43,56,58, + 56, + 64, + 57, + 37,29,58,31, + 42,31,78,79, + 64, + 64, + 49,5,8,18,23,28,37,29,52,57,65,68,79, + 42,50,63,71,79,82, + 49, + 36,64,67, + 64, + 64, + 64, + 37,29, + 81, + 49,42,47,72, + 50, + 31, + 7,13,19,24,43,45,46,50,66,69,32,76, + 25, + 61, + 19,22,61,64, + 64,82, + 5, + 9,73, + 73, + 73, + 73, + 73, + 10,15,40,75,78,80, + 5,11,12,26,28,43,58,64,72,32, + 5, + 5, + 44,45,46,60,71,74, + 43,32, + 43,58,32, + 20, + 26,42,31, + 3,13,66, + 3, + 3, + 15,50,31,78,80,82, + 50, + 50, + 11,14,58,64,68,82, + 14,58, + 11,58, + 14, + 43, + 64, + 45, + 38, + 64, + 19,22, + 10,15,78,80, + 0,1,2,49,7,9,11,12,13,14,15,16,18,19,20,22,23,24,25,26,27,28,33,34,35,38,41,42,44,45,46,47,48,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,32,30,74,75,76,77,78,79,80,82, + 6,9,14,16,30,73, + 17,27,34,37,29,53,59,30, + 3,17,34,66,74, + 49,32, + 49,5,16,17,18,21,25,26,35,36,38,43,46,48,51,58,62,32, + 25,27,53,59, + 2,32, + 19,56,58, + 32, + 32, + 56, + 56, + 31,82, + 64, + 9,28,65,32,79, + 32, + 73, + 14,38,32, + 32, + 49, + 49,68, + 20,37,29,50,53,30, + 0,5,12,14,57, + 39,50,31, + 64, + 64, + 64, + 64, + 64, + 14,58, + 64, + 64, + 43, + 7,19,22,25,42,43,45,50,55,66,69,32,73,74,76,77,81, + 44,45,60,74, + 64, + 7,8, + 64, + 64, + 2,11,20,23,26, + 58, + 66, + 30, + 1,2,3,4,49,5,6,7,8,9,13,14,17,18,19,20,22,23,24,25,27,28,33,34,35,36,39,41,42,43,44,45,46,50,53,54,55,56,58,59,60,61,62,65,66,67,68,69,32,73,74,76,77,78,79,81,82, + 3,4,5,6,8,10,17,36,39,56,58,67,73, + 39,82, + 1,3,7,13,14,17,18,19,20,22,23,24,27,28,34,36,37,39,29,41,53,54,55,56,58,59,65,68,69,76,77,79,82, + 50, + 42, + 73, + 73, + 45, + 7,27,41,50,66,69, + 3,20,34,64,66, + 64, + 64, + 64, + 64, + 6,16,21,52,58,30, + 58, + 6,19,22,56,58,73, + 17, + 64, + 9,58,64, + 9,73, + 9,73, + 32, + 58, + 50,55,66,78,82, + 1,7,9,13,19,20,22,24,25,26,27,33,34,41,42,46,47,48,50,53,54,55,59,60,61,64,66,69,31,74,76,77,81,82, + 71,32, + 53, + 2, + 32, + 34,59,64,66, + 52,82, + 2, + 47,64, + 64, + 43, + 49,43,66,67,32, + 82, + 37,29, + 66, + 11,63,71, + 64, + 50, + 49,21,64,66,31,75,79,82, + 39, + 44,32, + 7,9,22,27,46,32, + 46,48, + 48, + 48, + 42, + 2,13,19,24,27,42,46,47,48,50,59,60,64,66,76, + 47, + 47, + 47, + 47, + 47, + 47, + 3,4,5,6,8,10,15,17,36,39,40,50,56,58,63,67,71,32,31,73,75,78,80,82, + 78, + 38,43,51,64,32, + 0,58, + 0,58, + 39,50, + 7,14,27,48,50,69, + 46,47,48,66,75, + 82, + 50, + 50, + 50, + 64, + 64, + 64, + 50,78, + 50, + 7,43,66,74,77, + 7,43,66,74,77, + 7,43,74,77, + 64, + 49, + 49, + 49, + 49, + 82, + 0,1,49,7,8,9,11,13,14,17,20,23,24,25,27,33,34,36,41,43,53,55,57,58,59,64,65,66,32,73,77,79,80, + 58, + 58, + 8, + 8, + 8, + 8, + 0, + 82, + 32, + 32, + 49,45, + 14,28,66,32,30,78,82, + 49, + 3,24, + 43,58, + 71,72, + 32, + 1,14,27,45,58,64,66,73,74,77, + 82, + 32, + 1,49,7,13,18,19,20,22,23,24,25,27,28,34,41,42,53,54,55,59,65,66,68,69,76,77,79,81,82, + 19,64,66, + 78, + 78, + 78, + 11,39,32, + 25,64, + 0,1,2,49,7,9,11,12,13,14,15,16,18,19,20,21,22,23,24,26,27,28,33,34,35,38,40,41,42,44,45,46,47,48,51,52,53,54,55,57,58,59,60,61,62,63,64,65,66,68,69,70,71,72,31,30,74,75,76,77,79,80,82, + 72, + 54,66,82, + 31, + 5,25,26,36, + 37,29,50,31,78, + 31, + 50, + 32, + 26, + 53,59, + 27, + 36,67, + 58, + 73, + 73, + 49, + 58, + 49, + 49, + 49, + 49, + 49, + 3,49,8,9,12,14,17,25,26,27,28,33,34,36,38,39,43,47,51,52,53,54,58,59,64,65,66,67,70,72,32,73,81, + 58, + 58, + 9,17,36, + 9,17,36, + 36, + 39, + 32, + 32, + 61,73, + 43,58, + 11, + 15,17,34,42,31,78,80, + 71, + 9,33,73, + 73, + 44,45,54,55,74,81,82, + 7,13,19,22,23,42,44,45,47,48,52,54,55,64,67,69,30,74,76,77,81, + 50, + 64, + 64, + 58,64, + 32, + 58, + 64,66,67,32,30,75,82, + 37,29,50,31,78, + 49,8,64, + 50, + 11,12,58,63,71, + 37,29,50,73, + 49, + 50,66,82, + 6,10,35,30, + 10, + 64, + 64, + 14, + 45, + 49,30, + 27,34,53, + 27,34,37,29,53,59, + 3,4,5,6,8,10,17,36,39,43,56,57,58,67,32,73, + 0,1,2,49,7,9,11,12,13,14,16,18,19,20,21,22,23,24,25,26,27,28,33,34,35,38,41,44,46,47,48,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,32,74,76,77,79,82, + 1,49,13,18,20,23,24,27,28,34,41,53,54,55,59,64,65,68,77,78,79, + 3,10,16,36,37,29,46,50,32,31,30,78,80,82, + 37,29,50,58,64,31, + 0,1,2,3,4,49,5,6,7,8,9,10,11,13,14,16,17,18,19,20,22,23,24,25,26,27,28,33,34,35,36,38,39,41,42,43,44,45,46,47,48,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,32,30,73,74,76,77,79,82, + 5,43,58,32,73, + 58, + 5, + 11,58, + 12,58, + 82, + 58, + 39,58,73, + 5, + 3,4,5,6,8,10,15,17,36,39,43,56,58,67,73,75,80, + 13,24,54,64,31, + 3,5,8,9,12,17,22,25,26,28,33,36,38,41,46,51,55,58,64,67,32,73,76, + 42,45,50, + 5,38,43,52,58,32, + 50, + 25,43,46,32, + 50, + 5,37,39,29,50,57,82, + 82, + 39, + 82, + 64,65, + 6,19,22,27,58,73, + 82, + 8, + 49,8,47, + 49, + 50,78, + 11,32, + 58,71, + 79, + 32, + 17,39,58,64, + 32, + 32, + 32, + 32, + 32, + 32, + 32, + 32, + 32, + 0,12,14,15,25,47,58,70,71,72,73,75,78,80,82, + 3, + 4, + 73, + 3, + 4,5,58,73, + 5, + 5, + 56,58, + 56,58, + 56, + 73, + 73, + 73, + 73, + 3, + 3, + 6, + 5,17,58, + 56, + 56, + 73, + 73, + 6,58, + 58, + 6,73, + 58, + 17,36,58, + 8, + 8, + 8, + 8, + 3, + 3,58,67, + 58, + 17,36, + 17,36, + 36, + 17, + 73, + 73, + 6, + 58, + 39, + 58, + 3, + 3, + 3, + 5, + 73, + 73, + 73, + 73, + 58, + 3, + 3, + 3,8, + 3, + 3,8, + 3,8, + 3,8,73, + 4, + 4, + 4, + 17, + 4,73, + 3, + 3, + 3, + 3, + 73, + 73, + 17, + 17, + 3, + 3, + 3, + 8, + 8, + 8, + 58, + 17, + 73, + 73, + 73, + 73, + 6, + 58, + 58, + 36, + 67, + 67, + 36, + 8, + 8, + 6, + 56, + 56, + 56, + 56, + 56, + 73, + 73, + 73, + 73, + 73, + 3, + 3, + 3, + 17, + 73, + 3, + 17,36,58, + 58, + 58,73, + 73, + 73, + 0,11,14,19,28,39,43,50,52,58,64,71,72,32, + 37,29,31, + 44,50,73,78, + 64, + 31, + 64, + 3,4,5,6,8,10,17,36,37,39,29,43,56,58,67,32,31,73, + 31, + 58, + 3,4,5,6,8,10,17,36,39,43,56,58,67,73, + 28, + 5, + 51,31, + 39, + 14, + 16, + 25,82, + 9,25,52,58, + 48,55, + 43,32, + 32, + 44,45,46,60,61,74, + 32, + 14, + 52, + 19, + 47, + 26,47, + 26, + 49, + 58,72, + 3, + 20, + 52, + 52, + 49,37,29, + 43,58,64, + 50, + 75, + 0, + 14, + 78, + 40,78, + 50, + 36, + 3,17,28,67, + 58, + 43,58, + 34, + 14, + 43,32, + 43,32, + 43,32, + 64, + 50,78, + 50,78, + 64, + 49, + 64, + 44,45,60,74,82, + 82, + 58, + 36,67, + 23,42, + 42,45, + 45, + 45, + 20, + 82, + 45,50,78, + 58, + 0,43,66,32, + 1,13, + 52, + 2,3,41,66,82, + 3, + 3, + 66, + 3,9,11,12,14,18,20,25,28,34,39,52,57,58,63,64,65,66,68,70,71,72,73,79,82, + 5, + 9, + 70, + 70, + 25, + 52, + 52, + 52, + 18,20,52,63,65,68,79, + 52, + 71, + 33, + 50, + 42,45,51,66,73, + 45, + 45, + 5, + 55, + 42,45,31,73, + 50, + 45, + 66,72, + 64, + 0,1,2,49,7,9,11,12,13,14,16,18,19,20,21,22,23,24,25,26,27,28,33,34,35,38,41,42,43,44,45,46,47,48,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,32,74,76,77,79,81,82, + 82, + 24,76, + 5,6,9,43,47,48,52,58,73,74,82, + 5, + 1,3,17,36,58,67,73, + 3,20, + 5,26, + 10,30, + 7,10,43,56,58,73, + 5,7,43,56,58,73, + 4,7,39,56, + 43,32, + 73, + 9,73, + 9,73, + 9,73, + 3,13, + 3,13, + 6,16, + 5,17,18,43,58, + 19,56,58, + 19,56, + 6,58, + 6,22,58,73, + 22, + 8,17,23,36,58, + 3,24, + 3,17,28,36,58,67,73, + 28,36, + 17,34, + 33,73, + 33,73, + 6,35, + 38,43,58, + 4,52, + 49,8, + 49,8, + 3,20, + 3,41, + 3,41, + 42,73, + 44,73, + 44,73, + 44,73, + 46, + 46, + 5,47, + 5,47, + 48,73, + 48,73, + 51,73, + 4,52, + 17,53, + 3,4,54, + 3,54, + 3,54,73, + 3,20, + 45,73, + 17,27,36, + 17,27,58,73, + 49,8, + 49,8, + 49,8, + 17,59, + 58,60,73, + 61,73, + 6,62, + 58,63, + 36,65, + 36,66,67, + 67, + 36,68, + 5,6,10,56,69, + 56, + 56,76, + 56,76, + 17,73,74, + 73,74, + 73,74, + 3,6,17,36,56,58,67,73,77, + 3,4,17,77, + 3,4,5,6,8,17,36,39,43,55,56,58,67,73, + 3,55, + 3,55, + 3,17,36,58,67,73,79, + 82, + 50, + 43,32, + 52, + 43,58,73, + 43,32, + 26,34,43,64, + 17, + 34, + 26,64,32, + 26,34,38,64, + 26, + 64, + 64, + 51,55,66,80, + 32, + 43,32, + 31, + 64, + 50, + 49, + 0,1,2,49,7,9,11,12,13,14,15,16,18,19,20,21,22,23,24,25,26,27,28,33,34,35,38,40,41,42,44,45,46,47,48,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,32,31,74,76,77,78,79,80,81,82, + 64, + 2,49,50,78, + 2,4, + 45, + 1,55, + 26,34,43,32, + 43, + 17, + 34, + 43,32, + 26,28,43,32, + 26,34,64, + 26, + 24,76, + 44,73, + 73, + 73, + 73, + 0,10,14,64,78,80, + 2,37,29, + 14,45, + 45,73, + 37,29,50,31, + 43,32, + 50,78, + 45,48, + 82, + 5,46,47,48,73, + 46,73, + 46,73, + 57, + 43,46,48,71,32, + 64, + 0,1,2,49,7,9,13,14,16,18,19,20,21,22,23,24,27,28,33,34,35,38,41,42,44,45,46,47,48,51,52,53,54,55,59,61,62,63,64,65,68,69,70,71,72,31,74,76,77,78,79,81,82, + 7,27,41,69, + 25, + 17,34, + 43, + 43, + 64, + 46,47,48, + 46,48, + 46,48, + 47, + 47, + 43, + 43, + 7,9,25,27,28,33,34,46,48,53,59,60,61,64,69,74, + 64, + 9,33,64,66,32, + 14, + 51, + 64, + 1,49,7,13,14,18,19,20,22,23,24,25,27,28,34,41,42,50,53,54,55,59,65,66,68,69,73,76,77,78,79,81,82, + 43, + 43, + 20, + 11, + 43, + 3,13,24,51,54,76, + 19, + 28, + 49, + 64, + 26,34,40,46,47,48,51,58,63,64,71,73,78, + 47, + 1,2,3,4,5,6,8,9,10,13,15,16,17,18,20,23,24,25,27,28,33,34,36,37,39,29,41,42,44,45,46,50,51,53,54,55,56,57,58,59,60,64,65,67,68,72,32,31,30,73,74,77,78,79,80,82, + 25,43,45,64, + 0,9,14,33,50,70,71,72,78,82, + 11, + 51,73, + 42,43,58,82, + 55, + 0,14,21,46,47,48,54,55,58,64,66,73,81, + 75, + 11,14,50,58,31,82, + 11,58, + 0,1,2,4,49,5,6,7,9,11,12,13,14,16,19,20,21,22,24,25,26,27,33,34,35,37,38,29,41,44,45,46,47,48,51,52,53,54,55,57,58,59,60,61,62,63,64,66,69,70,71,72,30,73,74,76,77,82, + 58,64, + 31, + 7, + 37,29, + 78,80, + 64, + 49, + 50, + 50, + 7,19,22,42,50,69,76,77, + 58, + 0,14,44,45,60,74, + 0,1,2,49,7,9,11,12,13,14,15,16,18,19,20,21,22,23,24,26,27,28,33,34,35,38,41,44,45,46,47,48,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,32,30,74,75,76,77,79,80,82, + 50,64, + 52, + 42,66, + 42, + 19,22,42,66, + 56, + 5, + 5, + 5, + 3, + 3,4,17,36,39,56,58,73, + 3,6,8,17,56,58,67,73, + 8, + 3, + 8, + 8, + 8, + 3,6,8,17,56,58,67,73, + 4,39, + 3,8,17,58,67,73, + 3,8,17,73, + 3,8,17,73, + 3, + 8,17, + 8,17, + 56, + 8,17, + 8, + 50, + 7,41,42,64, + 0,14,55,64, + 4,15,34,58,64,66,75,78,80, + 64, + 64, + 0, + 16,19,50, + 4,52, + 4, + 4, + 4, + 20,41,46,54,66, + 17,53, + 53, + 4,25,52,73, + 66, + 46,58,73, + 45, + 17,53, + 45,50,64, + 2,3,4,44,50,52,54,66,73,81,82, + 28,66,67,73,81, + 3, + 3, + 3, + 31, + 2, + 50,78, + 0,1,3,4,49,7,8,13,14,17,19,20,22,23,24,27,36,39,41,42,43,44,46,50,51,54,55,58,61,64,66,67,69,32,73,74,76,77,82, + 1,3,7,8,13,23,27,41,54,74,77, + 1,3,7,8,13,23,27,41,54,74,77, + 1,3,8,13,54, + 3,8, + 3, + 43,32, + 3,20, + 15,80, + 0,45,50,55,64,73,81, + 64, + 28, + 64, + 5,20,57,64,32, + 58,63, + 66, + 42,50, + 78, + 42, + 50, + 64,66, + 7,19,22,37,29,56,69,76, + 43,58,32, + 17,27,36,58,73, + 73, + 36,73, + 17, + 17, + 64, + 14,58,64,70, + 58,64, + 2,9,14,16,21,26,33,35,44,46,47,48,51,52,57,60,61,62,63,64,70,73,74, + 39, + 46,81, + 43, + 5,57, + 5,57, + 43,32, + 64, + 0,1,2,49,7,9,11,12,13,14,15,16,18,19,20,21,22,23,24,26,27,28,33,34,35,38,41,44,45,46,47,48,50,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,30,74,75,76,77,79,80,82, + 58, + 2, + 3,17,36,58,73, + 73, + 17,36,73, + 3,17,36,58,73, + 58, + 32, + 3,4,17,36,58,73, + 8, + 8, + 8, + 8, + 8, + 8, + 8, + 8, + 49,8,54,32, + 33,36,67, + 82, + 3,9,13,19,22,24,33,66,69,73,76, + 3,19,24,76, + 6,19,56,58,73, + 19,56, + 56, + 24,76, + 24,76, + 39,43,58, + 0,25,37,29,31,75, + 78, + 52, + 78, + 64, + 42,55, + 78, + 55, + 66, + 73, + 80, + 50,80, + 45, + 50, + 39,44,45,50,58,60,64,70,71,72,74,82, + 39,82, + 52, + 78, + 0,11,12,14,37,38,29,58,63,64,70,71,72, + 46,48, + 50,54, + 50, + 64,31, + 64, + 64, + 58, + 50, + 50, + 38,66, + 50, + 64, + 0,1,2,4,49,5,6,7,9,11,12,13,14,16,18,19,20,21,22,23,24,25,26,27,28,33,34,35,38,41,44,46,47,48,50,51,52,53,54,55,57,58,59,60,61,62,63,64,65,66,68,69,70,71,72,32,73,74,76,77,79,82, + 64, + 12, + 25,26,43,50,32,82, + 46,60, + 17,59,64, + 15,45,78,80, + 64, + 73, + 73, + 46,50,59,60,73, + 46,50,58,60,73, + 64, + 43,58, + 11,13,14,17,47,58,61,70,71,72,82, + 16,35,62, + 16,35,62, + 3,4,5,6,8,10,17,36,37,39,29,43,56,58,67,73, + 46,64,66,73,82, + 64, + 32, + 50,31, + 61,73, + 50, + 0,1,2,49,7,9,11,12,13,14,15,16,18,19,20,21,22,23,24,26,27,28,33,34,35,38,41,44,45,46,47,48,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,32,30,74,75,76,77,79,80,82, + 45,50,80, + 31, + 7,13,19,22,42,44,45,47,48,52,54,55,64,67,69,30,74,76,77,81, + 2,6,50,62,30, + 58, + 64,66, + 0,1,2,4,7,9,11,12,13,14,15,16,18,19,20,21,22,23,24,25,26,27,28,33,34,35,38,39,41,42,44,45,46,47,48,50,51,52,53,54,55,57,58,59,60,61,62,63,64,65,66,68,69,70,71,72,32,31,74,76,77,78,79,80,81,82, + 33,66,81,82, + 52, + 30, + 20,27,53,59, + 0,14,26,28,36,46,51,55,81, + 10,15, + 3,4,5,6,8,10,17,36,56,58,67,73,80, + 3,10,36,67,75, + 58,63, + 5,39,58,78, + 78,80, + 0,2,4,9,11,12,14,16,18,21,25,27,33,34,35,37,38,39,29,40,43,44,45,46,48,50,51,52,53,57,58,59,60,61,62,63,64,70,71,72,32,73,74,75,78,82, + 32,30, + 32,30, + 17, + 25, + 33,36,39,58,73,82, + 73, + 73, + 12, + 64, + 12,18,36,51,65,68,80, + 49,27,36,51,53,59,65,68, + 45,55,79,82, + 15,80, + 28, + 27,41,70,71,32, + 50,32, + 42, + 54, + 51, + 54, + 42, + 46,47,48, + 28, + 49,8, + 9,54,64, + 36,66,67, + 36, + 36,67, + 36,67, + 36, + 82, + 50,64, + 28,45, + 49,7,8,19,22,25,27,36,47,51,53,59,68,69,76, + 8, + 8, + 25, + 59, + 13,20,54,55,32,77, + 0,7,9,14,33,42,47,58,64,72,73, + 49, + 0,60, + 5,6,10,56,69,73, + 56, + 56, + 56, + 3,20, + 0,64, + 64, + 64, + 64, + 64, + 43, + 49, + 15,78, + 1,27,45,66,74,77, + 37,29,46,48,31, + 48, + 48, + 64, + 66, + 50, + 64, + 3,4,5,6,8,17,36,56,58,67,73, + 25,50,58,71,82, + 58, + 39, + 32, + 25,82, + 25, + 25, + 25,36,39,58,73, + 25, + 82, + 25, + 45, + 43, + 58, + 58,70,71,72, + 58,70, + 58,71, + 58,72, + 28,34,43,51,64,32,73, + 64, + 64, + 73, + 44,73, + 44, + 19,22,42,45,69,73,81, + 7,27,39,50,69, + 64, + 64,66, + 64, + 26,66, + 50, + 49, + 66,67, + 64, + 45, + 7,25,50,64,70,79,82, + 45, + 66, + 38,58, + 45, + 38, + 7, + 1,3,13,17,20,36,42,44,54,55,67,73,81, + 64,75, + 20,46,48,55,73, + 64, + 82, + 43, + 17,34, + 17,34, + 14,34,38,43,58,64,32, + 64, + 58,64, + 43,52,32, + 50, + 5, + 5, + 56,76, + 56, + 56, + 56, + 73, + 73, + 5,16,47,61,73, + 5, + 5,9,33,37,29,44,45,46,47,48,50,51,60,61,73,74, + 45,46,48,51,73,74, + 46,47,48,73,74, + 73, + 73, + 73, + 10,75,78, + 75,80, + 50, + 50, + 3,4,54, + 0,14,52,58,32, + 19, + 28, + 36,67, + 0,1,2,49,7,9,11,12,13,14,15,16,18,19,20,21,22,23,24,25,26,27,28,33,34,35,38,41,42,44,45,46,47,48,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,32,30,74,75,76,77,78,79,80,82, + 32, + 0,3,4,49,7,8,9,12,16,17,19,23,35,36,38,39,45,46,47,48,52,64,67,69,32,73,76,81,82, + 20,25,26,52,64,66,32,30,82, + 64, + 14,64, + 39, + 15,19,80, + 78, + 5,39,58, + 2,49,14,25,26,34,37,29,45,47,50,64,66,72,32,30,75,82, + 0,1,2,49,7,9,11,12,13,14,15,16,18,19,20,21,22,23,24,26,27,28,33,34,35,38,41,44,45,46,47,48,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,30,74,75,76,77,78,79,80,82, + 6,56,58,73, + 49, + 49, + 49, + 49, + 0, + 43,58,32, + 32, + 0,2,7,9,14,19,22,27,33,38,40,42,43,45,46,48,51,54,58,59,63,64,66,69,32,74,76,77, + 25, + 64, + 3,4,6,13,17,19,22,24,27,36,41,42,44,46,48,54,56,58,59,60,64,66,67,73,74,76,77,81, + 3,67, + 3,17, + 17, + 17, + 3,17, + 17, + 17, + 17, + 64, + 3,4,6,13,14,17,19,22,23,24,27,43,44,53,54,55,56,58,59,61,69,32,73,76, + 55, + 23, + 23, + 32, + 32, + 1,3,49,5,7,8,14,17,23,25,36,39,41,54,56,58,67,73,74,77, + 49,7,27,28,41,50,66,69,31, + 64, + 0,9,10,14,33,42,50,70,71,72,32,78,79,80,82, + 50, + 50, + 43,32, + 73, + 73, + 73, + 73, + 73, + 3,17,36,58,73, + 4, + 73, + 58, + 58, + 2, + 2,4, + 7,25,27,41,44,46,69,82, + 2,4, + 64, + 67, + 43, + 43,32, + 32, + 11,17,43,64,80, + 28,32, + 37,29, + 0,1,2,49,7,9,11,12,13,14,16,18,19,20,21,22,23,24,25,26,27,28,33,34,35,38,41,42,44,45,46,47,48,50,51,52,53,54,55,57,59,60,61,62,63,64,65,66,68,69,70,71,72,31,74,76,77,79,82, + 3,49,11,14,17,25,27,28,36,43,53,58,59,66,67,71,72,73,79, + 58, + 58, + 17, + 17, + 78,80, + 25,50,31, + 14,40,78, + 58, + 37,29,46,50,64,66,81,82, + 66, + 36,67, + 3,7,24,42,45,55,66,69,32, + 7, + 7, + 42, + 42, + 42, + 43,32, + 43,32, + 66, + 81, + 5, + 5, + 3,7,24,42,55,66,69,32, + 7, + 7, + 42, + 42, + 42, + 43,32, + 43,32, + 15,34,63,71,32,31,78,81,82, + 42, + 5, + 5, + 2,3,7,42,55,69,32, + 7, + 7, + 19, + 43,32, + 43,32, + 50, + + diff --git a/doc/salome/gui/GEOM/whxdata/whgdata0.xml b/doc/salome/gui/GEOM/whxdata/whgdata0.xml index 0075ff8d5..b0993a043 100755 --- a/doc/salome/gui/GEOM/whxdata/whgdata0.xml +++ b/doc/salome/gui/GEOM/whxdata/whgdata0.xml @@ -1,22 +1,22 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whxdata/whglo.xml b/doc/salome/gui/GEOM/whxdata/whglo.xml index 0f1cd68e5..ac67056d3 100755 --- a/doc/salome/gui/GEOM/whxdata/whglo.xml +++ b/doc/salome/gui/GEOM/whxdata/whglo.xml @@ -1,5 +1,5 @@ - - - - + + + + \ No newline at end of file diff --git a/doc/salome/gui/GEOM/whxdata/whidx.xml b/doc/salome/gui/GEOM/whxdata/whidx.xml index ac66bb966..44f05e5be 100755 --- a/doc/salome/gui/GEOM/whxdata/whidx.xml +++ b/doc/salome/gui/GEOM/whxdata/whidx.xml @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/doc/salome/gui/GEOM/whxdata/whtdata0.xml b/doc/salome/gui/GEOM/whxdata/whtdata0.xml index 2113e8b6f..346d9371b 100755 --- a/doc/salome/gui/GEOM/whxdata/whtdata0.xml +++ b/doc/salome/gui/GEOM/whxdata/whtdata0.xml @@ -1,119 +1,119 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/doc/salome/gui/GEOM/whxdata/whtoc.xml b/doc/salome/gui/GEOM/whxdata/whtoc.xml index a271ba7cc..871ec25b9 100755 --- a/doc/salome/gui/GEOM/whxdata/whtoc.xml +++ b/doc/salome/gui/GEOM/whxdata/whtoc.xml @@ -1,4 +1,4 @@ - - - - + + + + diff --git a/doc/salome/tui/GEOM/doxyfile b/doc/salome/tui/GEOM/doxyfile deleted file mode 100755 index 8f896a9dd..000000000 --- a/doc/salome/tui/GEOM/doxyfile +++ /dev/null @@ -1,200 +0,0 @@ -# Doxyfile 1.3-rc1 - -#--------------------------------------------------------------------------- -# General configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - GEOM - v.3.2.0a1" -PROJECT_NUMBER = id#1.1 -OUTPUT_DIRECTORY = ../ -OUTPUT_LANGUAGE = English -EXTRACT_ALL = YES -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = NO -ALWAYS_DETAILED_SEC = YES -INLINE_INHERITED_MEMB = YES -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -INTERNAL_DOCS = YES -CASE_SENSE_NAMES = YES -SHORT_NAMES = NO -HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES -SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 5 -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ALIASES = -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 25 -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = YES -SHOW_USED_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = log.txt -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = ../../../share/salome/idl/GEOM_Gen.idl -FILE_PATTERNS = -RECURSIVE = NO -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = sources/ -INPUT_FILTER = -FILTER_SOURCE_FILES = YES -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO -REFERENCES_RELATION = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = GEOM -HTML_FILE_EXTENSION = .html -HTML_HEADER = sources/myheader.html -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = YES -TOC_EXPAND = YES -DISABLE_INDEX = YES -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_SCHEMA = -XML_DTD = -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = NO -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = NO -HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = NO -TEMPLATE_RELATIONS = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DOT_IMAGE_FORMAT = jpg -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1200 -GENERATE_LEGEND = NO -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO -CGI_NAME = search.cgi -CGI_URL = -DOC_URL = -DOC_ABSPATH = -BIN_ABSPATH = /usr/local/bin/ -EXT_DOC_PATHS = diff --git a/doc/salome/tui/GEOM/doxyfile_py b/doc/salome/tui/GEOM/doxyfile_py deleted file mode 100755 index 477613518..000000000 --- a/doc/salome/tui/GEOM/doxyfile_py +++ /dev/null @@ -1,200 +0,0 @@ -# Doxyfile 1.3-rc1 - -#--------------------------------------------------------------------------- -# General configuration options -#--------------------------------------------------------------------------- -PROJECT_NAME = "SALOME - GEOM - v.3.2.0a1" -PROJECT_NUMBER = id#1.1 -OUTPUT_DIRECTORY = ../ -OUTPUT_LANGUAGE = English -EXTRACT_ALL = YES -EXTRACT_PRIVATE = YES -EXTRACT_STATIC = YES -EXTRACT_LOCAL_CLASSES = YES -HIDE_UNDOC_MEMBERS = NO -HIDE_UNDOC_CLASSES = NO -HIDE_FRIEND_COMPOUNDS = NO -HIDE_IN_BODY_DOCS = NO -BRIEF_MEMBER_DESC = YES -REPEAT_BRIEF = NO -ALWAYS_DETAILED_SEC = YES -INLINE_INHERITED_MEMB = YES -FULL_PATH_NAMES = NO -STRIP_FROM_PATH = -INTERNAL_DOCS = YES -CASE_SENSE_NAMES = YES -SHORT_NAMES = NO -HIDE_SCOPE_NAMES = NO -VERBATIM_HEADERS = YES -SHOW_INCLUDE_FILES = YES -JAVADOC_AUTOBRIEF = YES -MULTILINE_CPP_IS_BRIEF = NO -DETAILS_AT_TOP = NO -INHERIT_DOCS = YES -INLINE_INFO = YES -SORT_MEMBER_DOCS = NO -DISTRIBUTE_GROUP_DOC = NO -TAB_SIZE = 5 -GENERATE_TODOLIST = YES -GENERATE_TESTLIST = YES -GENERATE_BUGLIST = YES -GENERATE_DEPRECATEDLIST= YES -ALIASES = -ENABLED_SECTIONS = -MAX_INITIALIZER_LINES = 25 -OPTIMIZE_OUTPUT_FOR_C = YES -OPTIMIZE_OUTPUT_JAVA = YES -SHOW_USED_FILES = NO -#--------------------------------------------------------------------------- -# configuration options related to warning and progress messages -#--------------------------------------------------------------------------- -QUIET = NO -WARNINGS = YES -WARN_IF_UNDOCUMENTED = YES -WARN_FORMAT = "$file:$line: $text" -WARN_LOGFILE = log.txt -#--------------------------------------------------------------------------- -# configuration options related to the input files -#--------------------------------------------------------------------------- -INPUT = list_py_files_to_process -FILE_PATTERNS = -RECURSIVE = NO -EXCLUDE = -EXCLUDE_SYMLINKS = NO -EXCLUDE_PATTERNS = -EXAMPLE_PATH = -EXAMPLE_PATTERNS = -EXAMPLE_RECURSIVE = NO -IMAGE_PATH = ../sources/ -INPUT_FILTER = -FILTER_SOURCE_FILES = YES -#--------------------------------------------------------------------------- -# configuration options related to source browsing -#--------------------------------------------------------------------------- -SOURCE_BROWSER = NO -INLINE_SOURCES = NO -STRIP_CODE_COMMENTS = YES -REFERENCED_BY_RELATION = NO -REFERENCES_RELATION = YES -#--------------------------------------------------------------------------- -# configuration options related to the alphabetical class index -#--------------------------------------------------------------------------- -ALPHABETICAL_INDEX = NO -COLS_IN_ALPHA_INDEX = 5 -IGNORE_PREFIX = -#--------------------------------------------------------------------------- -# configuration options related to the HTML output -#--------------------------------------------------------------------------- -GENERATE_HTML = YES -HTML_OUTPUT = ../GEOM/geompy_doc -HTML_FILE_EXTENSION = .html -HTML_HEADER = ../sources/myheader_py2.html -HTML_FOOTER = -HTML_STYLESHEET = -HTML_ALIGN_MEMBERS = YES -GENERATE_HTMLHELP = NO -CHM_FILE = -HHC_LOCATION = -GENERATE_CHI = NO -BINARY_TOC = YES -TOC_EXPAND = YES -DISABLE_INDEX = YES -ENUM_VALUES_PER_LINE = 4 -GENERATE_TREEVIEW = YES -TREEVIEW_WIDTH = 250 -#--------------------------------------------------------------------------- -# configuration options related to the LaTeX output -#--------------------------------------------------------------------------- -GENERATE_LATEX = NO -LATEX_OUTPUT = latex -LATEX_CMD_NAME = latex -MAKEINDEX_CMD_NAME = makeindex -COMPACT_LATEX = NO -PAPER_TYPE = a4wide -EXTRA_PACKAGES = -LATEX_HEADER = -PDF_HYPERLINKS = NO -USE_PDFLATEX = NO -LATEX_BATCHMODE = NO -#--------------------------------------------------------------------------- -# configuration options related to the RTF output -#--------------------------------------------------------------------------- -GENERATE_RTF = NO -RTF_OUTPUT = rtf -COMPACT_RTF = NO -RTF_HYPERLINKS = NO -RTF_STYLESHEET_FILE = -RTF_EXTENSIONS_FILE = -#--------------------------------------------------------------------------- -# configuration options related to the man page output -#--------------------------------------------------------------------------- -GENERATE_MAN = NO -MAN_OUTPUT = man -MAN_EXTENSION = .3 -MAN_LINKS = NO -#--------------------------------------------------------------------------- -# configuration options related to the XML output -#--------------------------------------------------------------------------- -GENERATE_XML = NO -XML_SCHEMA = -XML_DTD = -#--------------------------------------------------------------------------- -# configuration options for the AutoGen Definitions output -#--------------------------------------------------------------------------- -GENERATE_AUTOGEN_DEF = NO -#--------------------------------------------------------------------------- -# configuration options related to the Perl module output -#--------------------------------------------------------------------------- -GENERATE_PERLMOD = NO -PERLMOD_LATEX = NO -PERLMOD_PRETTY = YES -PERLMOD_MAKEVAR_PREFIX = -#--------------------------------------------------------------------------- -# Configuration options related to the preprocessor -#--------------------------------------------------------------------------- -ENABLE_PREPROCESSING = YES -MACRO_EXPANSION = YES -EXPAND_ONLY_PREDEF = NO -SEARCH_INCLUDES = YES -INCLUDE_PATH = -INCLUDE_FILE_PATTERNS = -PREDEFINED = -EXPAND_AS_DEFINED = -SKIP_FUNCTION_MACROS = NO -#--------------------------------------------------------------------------- -# Configuration::addtions related to external references -#--------------------------------------------------------------------------- -TAGFILES = -GENERATE_TAGFILE = -ALLEXTERNALS = NO -EXTERNAL_GROUPS = YES -PERL_PATH = /usr/bin/perl -#--------------------------------------------------------------------------- -# Configuration options related to the dot tool -#--------------------------------------------------------------------------- -CLASS_DIAGRAMS = YES -HIDE_UNDOC_RELATIONS = NO -HAVE_DOT = YES -CLASS_GRAPH = YES -COLLABORATION_GRAPH = NO -TEMPLATE_RELATIONS = YES -INCLUDE_GRAPH = YES -INCLUDED_BY_GRAPH = NO -GRAPHICAL_HIERARCHY = YES -DOT_IMAGE_FORMAT = jpg -DOT_PATH = -DOTFILE_DIRS = -MAX_DOT_GRAPH_WIDTH = 1024 -MAX_DOT_GRAPH_HEIGHT = 1200 -GENERATE_LEGEND = NO -DOT_CLEANUP = YES -#--------------------------------------------------------------------------- -# Configuration::addtions related to the search engine -#--------------------------------------------------------------------------- -SEARCHENGINE = NO -CGI_NAME = search.cgi -CGI_URL = -DOC_URL = -DOC_ABSPATH = -BIN_ABSPATH = /usr/local/bin/ -EXT_DOC_PATHS = diff --git a/doc/salome/tui/GEOM/sources/Application-About.png b/doc/salome/tui/GEOM/sources/Application-About.png index 7b58330d50856e28562e8f9ed80dae72d6e6dda3..df0d5a187398c59271c45249950a92cd9cec68bb 100755 GIT binary patch delta 15 WcmbO=jdA8QMwZS1KlhESqTT>383gJ8 delta 16 XcmbO^jd9jAM%K;%KX=}ZETY~3Ffs)9 diff --git a/doc/salome/tui/GEOM/sources/bg_salome.gif b/doc/salome/tui/GEOM/sources/bg_salome.gif index 677b70468f798fe4fbc20fac3d706e61179ff12b..429489c691d274d2af69108c574491a022e78824 100755 GIT binary patch delta 32 ocmeBcXY6ff+)(Z;#^r5uI_1tvyIQN1T^GMNFW*$b%EDj`0NO?kApigX delta 33 pcmeBeXY6Zd+)(Z;&dcR(b2{bDO1oOClwB9UI4|E+!OFs54FKOV4KDxy diff --git a/doc/salome/tui/GEOM/sources/myheader.html b/doc/salome/tui/GEOM/sources/myheader.html index 83ca543cd..d2efb75fa 100755 --- a/doc/salome/tui/GEOM/sources/myheader.html +++ b/doc/salome/tui/GEOM/sources/myheader.html @@ -5,20 +5,9 @@ Main Page +   -
- - - - - - -
-
-
- - diff --git a/doc/salome/tui/GEOM/sources/static/doxygen.css b/doc/salome/tui/GEOM/sources/static/doxygen.css index 0a8e93d50..88e613d23 100755 --- a/doc/salome/tui/GEOM/sources/static/doxygen.css +++ b/doc/salome/tui/GEOM/sources/static/doxygen.css @@ -1,21 +1,139 @@ -H1 { text-align: center; } -CAPTION { font-weight: bold } +H1 { + text-align: center; +} + +CAPTION { + font-weight: bold +} + +/* Link in the top navbar */ A.qindex {} + A.qindexRef {} -A.el { text-decoration: none; font-weight: bold } -A.elRef { font-weight: bold } -A.code { text-decoration: none; font-weight: normal; color: #4444ee } -A.codeRef { font-weight: normal; color: #4444ee } -A:hover { text-decoration: none; background-color: lightblue } -DL.el { margin-left: -1cm } -DIV.fragment { width: 100%; border: none; background-color: #CCCCCC } -DIV.ah { background-color: #CCCCCC; font-weight: bold; color: #ffffff; margin-bottom: 3px; margin-top: 3px } -TD.md { background-color: lightblue; font-weight: bold; } -TD.mdname1 { background-color: lightblue; font-weight: bold; color: #602020; } -TD.mdname { background-color: lightblue; font-weight: bold; color: #602020; width: 600px; } -DIV.groupHeader { margin-left: 16px; margin-top: 12px; margin-bottom: 6px; font-weight: bold } -DIV.groupText { margin-left: 16px; font-style: italic; font-size: smaller } -BODY { background: url(sources/bg_salome.gif) } + +/* Link to any cross-referenced Doxygen element */ +A.el { + text-decoration: none; + font-weight: bold +} + +A.elRef { + font-weight: bold +} + +/* Link to any cross-referenced Doxygen element inside a code section + (ex: header) +*/ +A.code { + text-decoration: none; + font-weight: normal; + color: #4444ee +} + +A.codeRef { + font-weight: normal; + color: #4444ee +} + +A:hover { + text-decoration: none; + background-color: lightblue +} + +DL.el { + margin-left: -1cm +} + +/* A code fragment (ex: header) */ +DIV.fragment { + width: 100%; + border: none; + background-color: #CCCCCC +} + +/* In the alpha list (coumpound index), style of an alphabetical index letter */ +DIV.ah { + background-color: #CCCCCC; + font-weight: bold; + color: #ffffff; + margin-bottom: 3px; + margin-top: 3px +} + +/* Method name (+ type) */ +TD.md { + background-color: lightblue; + font-weight: bold; +} + +/* Method parameter (some of them) */ +TD.mdname1 { + background-color: lightblue; + font-weight: bold; color: #602020; +} + +/* Method parameter (some of them) */ +TD.mdname { + background-color: lightblue; + font-weight: bold; + color: #602020; + width: 600px; +} + +/* Separator between methods group (usually empty, seems not supported by IE) */ +DIV.groupHeader { + margin-left: 16px; + margin-top: 12px; + margin-bottom: 6px; + font-weight: bold +} + +DIV.groupText { + margin-left: 16px; + font-style: italic; + font-size: smaller +} + +BODY { + background: #FFFFFF; +} + +/*div.div-page { + background-color: #FFFFFF; + margin-left: 1em; + margin-right: 1em; + margin-top: 1em; + margin-bottom: 0.1em; + + padding-left: 1em; + padding-right: 1em; + padding-top: 0.5em; + padding-bottom: 0.5em; + + border: 2px solid #0D299A; + border-width: 2px; + border-color: #0D299A; +}*/ + +div.tabs { + text-align: justify; + margin-left : 2px; + margin-right : 2px; + margin-top : 2px; + margin-bottom : 2px + font-weight: bold; + color: #FFFFFF; +} + +DIV.div-footer { + margin-left: 1em; + margin-right: 1em; + margin-bottom: 0.2em; + text-align: right; + font-size: 9pt; +} + +/* In File List, Coumpound List, etc, 1st column of the index */ TD.indexkey { background-color: #CCCCCC; font-weight: bold; @@ -28,6 +146,8 @@ TD.indexkey { margin-top : 2px; margin-bottom : 2px } + +/* In File List, Coumpound List, etc, 2nd column of the index */ TD.indexvalue { background-color: #CCCCCC; font-style: italic; @@ -40,6 +160,7 @@ TD.indexvalue { margin-top : 2px; margin-bottom : 2px } + span.keyword { color: #008000 } span.keywordtype { color: #604020 } span.keywordflow { color: #e08000 } diff --git a/doc/salome/tui/GEOM/sources/static/tree.js b/doc/salome/tui/GEOM/sources/static/tree.js deleted file mode 100755 index dcd04073a..000000000 --- a/doc/salome/tui/GEOM/sources/static/tree.js +++ /dev/null @@ -1,59 +0,0 @@ -foldersTree = gFld("SALOME v.3.2.0a1 ", "", "") - insDoc(foldersTree, gLnk("Main Page", "", "main.html")) - -aux1 = insFld(foldersTree, gFld("TUI Reference Guide", "")) - aux2 = insFld(aux1, gFld("Modules", "")) - aux3 = insFld(aux2, gFld("SALOME GEOMETRY module", "")) -/*! insDoc(aux3, gLnk("Overview", "", "overview_Geometry.html"))*/ - aux4 = insFld(aux3, gFld("Packages", "")) - insDoc(aux4, gLnk("GEOM", "", "namespaceGEOM.html")) -/*! insDoc(aux3, gLnk("Examples", "", "examples_GEOM.html")) -*/ - -/*! Data structures -*/ - insDoc(aux1, gLnk("Data Structures", "", "annotated.html")) - -/*! insDoc(aux1, gLnk("GEOM::GEOM_Gen", "", "interfaceGEOM_1_1GEOM__Gen.html")) - insDoc(aux1, gLnk("GEOM::GEOM_Shape", "", "interfaceGEOM_1_1GEOM__Shape.html")) -*/ - insDoc(aux1, gLnk("Class Hierarchy", "", "hierarchy.html")) - -/*! - aux3 = insFld(aux2, gFld("GEOM::GEOM_Gen", "", "interfaceGEOM_1_1GEOM__Gen.html")) - aux3 = insFld(aux2, gFld("GEOM::GEOM_Shape", "", "interfaceGEOM_1_1GEOM__Shape.html")) - aux3 = insFld(aux2, gFld("GEOM::AxisStruct", "", "structGEOM_1_1AxisStruct.html")) - aux3 = insFld(aux2, gFld("GEOM::DirStruct", "", "structGEOM_1_1DirStruct.html")) - aux3 = insFld(aux2, gFld("GEOM::PointStruct", "", "structGEOM_1_1PointStruct.html")) -*/ - insDoc(aux1, gLnk("Class methods list", "", "functions.html")) -/*! -aux1 = insFld(foldersTree, gFld("Namespace List", "", "namespaces.html")) - insDoc(aux1, gLnk("GEOM", "", "namespaceGEOM.html")) -*/ - insDoc(aux1, gLnk("Namespace Members", "", "namespacemembers.html")) - - insDoc(aux1, gLnk("File List", "", "files.html")) - -/*! - - insDoc(aux1, gLnk("GEOM_Gen.idl", "", "GEOM__Gen_8idl.html")) - insDoc(aux1, gLnk("GEOM_Shape.idl", "", "GEOM__Shape_8idl.html")) -*/ - -aux1 = insFld(foldersTree, gFld("IDL/Python mapping", "")) - insDoc(aux1, gLnk("Mapping of GEOMETRY IDL definitions to Python language", "", "page2.html")) - -/*!aux1 = insFld(foldersTree, gFld("Python Commands", "", "geompy_doc/main.html")) - insDoc(aux1, gLnk("Package geompy", "", "geompy_doc/namespacegeompy.html")) - insDoc(aux1, gLnk("Namespace Members", "", "geompy_doc/namespacemembers.html")) - insDoc(aux1, gLnk("File geompy.py", "", "geompy_doc/geompy_8py.html")) -*/ - -aux1 = insFld(foldersTree, gFld("Python Commands", "", "geompy_doc/main.html")) - insDoc(aux1, gLnk("Package List", "", "geompy_doc/namespaces.html")) - insDoc(aux1, gLnk("Namespace Members", "", "geompy_doc/namespacemembers.html")) - insDoc(aux1, gLnk("File List", "", "geompy_doc/files.html")) - -/*! insDoc(foldersTree, gLnk("Graphical Class Hierarchy", "", "inherits.html")) -*/ diff --git a/doc/salome/tui/Makefile.in b/doc/salome/tui/Makefile.in index 8a2c77608..ee5277502 100644 --- a/doc/salome/tui/Makefile.in +++ b/doc/salome/tui/Makefile.in @@ -1,11 +1,25 @@ -# Copyright (C) 2003 CEA/DEN, EDF R&D +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com # # File : Makefile.in # Author : Vasily Rusyaev (Open Cascade NN) # Module : doc -# $Header: top_srcdir=@top_srcdir@ top_builddir=../../.. @@ -22,25 +36,45 @@ PYTHON_SCRIPTS = \ #PYTHON_SCRIPTS_PY2 = py2/geompy.py py2/GEOM_TestMeasures.py -docs: - cp -fr $(srcdir)/GEOM ./INPUT +dev_docs: + cp -fr $(srcdir)/GEOM ./INPUT; \ + cp -fr ./GEOM/doxyfile ./GEOM/doxyfile_py ./INPUT; \ + cp -fr ./GEOM/sources/static/tree.js ./INPUT/sources/static; \ cd INPUT; \ sed 's|../../../share/salome|$(root_srcdir)|' ./doxyfile > ./doxyfile1; \ - mv -f doxyfile1 doxyfile; \ - $(doxygen) ./doxyfile; \ - mkdir py1; mkdir py2; \ - cd .. - for file in $(PYTHON_SCRIPTS) dummy; do \ - if [ $$file != "dummy" ]; then \ - cp $(root_srcdir)/src/GEOM_SWIG/$$file INPUT/py1/; \ - fi ; \ - done - cd INPUT; \ - python $(KERNEL_ROOT_DIR)/doc/salome/tui/KERNEL/pythfilter.py ./py1 ./py2; \ - sed 's|list_py_files_to_process|$(PYTHON_SCRIPTS)|' ./doxyfile_py > py2/doxyfile_py; \ - cd py2; \ - $(doxygen) ./doxyfile_py; \ - cd ../..; \ + sed 's|../../build/salome|$(top_builddir)|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + if (test "x@DOXYGEN_WITH_PYTHON@" = "xyes"); then \ + echo "DOXYGEN SUPPORT PYTHON - @DOXYGEN_WITH_PYTHON@"; \ + sed 's|python_extension_must_be_here|*.py|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + $(doxygen) -u ./doxyfile1; \ + if( test "x@DOXYGEN_WITH_STL@" = "xyes"); then \ + sed -e 's|BUILTIN_STL_SUPPORT = NO|BUILTIN_STL_SUPPORT = YES|' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + fi; \ + mv -f doxyfile1 doxyfile; \ + $(doxygen) ./doxyfile; \ + cd ..; \ + else \ + sed 's|python_extension_must_be_here||' ./doxyfile1 > ./doxyfile2; \ + mv -f doxyfile2 doxyfile1; \ + mv -f doxyfile1 doxyfile; \ + $(doxygen) ./doxyfile; \ + mkdir py1; mkdir py2; \ + cd ..; \ + for file in $(PYTHON_SCRIPTS) dummy; do \ + if [ $$file != "dummy" ]; then \ + cp $(root_srcdir)/src/GEOM_SWIG/$$file INPUT/py1/; \ + fi ; \ + done; \ + cd INPUT; \ + python $(KERNEL_ROOT_DIR)/share/doc/salome/tui/KERNEL/pythfilter.py ./py1 ./py2; \ + sed 's|list_py_files_to_process|$(PYTHON_SCRIPTS)|' ./doxyfile_py > py2/doxyfile_py; \ + cd py2; \ + $(doxygen) ./doxyfile_py; \ + cd ../..; \ + fi; \ cp -fr $(srcdir)/GEOM/sources/static/*.* ./GEOM/ cp -fr $(srcdir)/GEOM/sources/ GEOM/ cp -fr $(srcdir)/GEOM/HTML/ GEOM/ diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.cxx b/src/ARCHIMEDE/Archimede_VolumeSection.cxx index 9558be90f..ec5fbdbea 100644 --- a/src/ARCHIMEDE/Archimede_VolumeSection.cxx +++ b/src/ARCHIMEDE/Archimede_VolumeSection.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/ARCHIMEDE/Archimede_VolumeSection.hxx b/src/ARCHIMEDE/Archimede_VolumeSection.hxx index 3d4b6ed0c..6dc4c8799 100644 --- a/src/ARCHIMEDE/Archimede_VolumeSection.hxx +++ b/src/ARCHIMEDE/Archimede_VolumeSection.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/ARCHIMEDE/Makefile.in b/src/ARCHIMEDE/Makefile.in index a024382a5..10b2247cc 100644 --- a/src/ARCHIMEDE/Makefile.in +++ b/src/ARCHIMEDE/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -44,9 +44,9 @@ LIB_CLIENT_IDL = EXPORT_HEADERS = Archimede_VolumeSection.hxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) $(KERNEL_LDFLAGS) # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/BREPExport/BREPExport.cxx b/src/BREPExport/BREPExport.cxx index 6caa7c071..c7d25b655 100644 --- a/src/BREPExport/BREPExport.cxx +++ b/src/BREPExport/BREPExport.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BREPExport.cxx // Created: Wed May 19 13:10:05 2004 diff --git a/src/BREPExport/Makefile.in b/src/BREPExport/Makefile.in index 8983e67c6..1545fe667 100644 --- a/src/BREPExport/Makefile.in +++ b/src/BREPExport/Makefile.in @@ -14,7 +14,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -39,9 +39,9 @@ LIB = libBREPExport.la LIB_SRC = BREPExport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKBRep -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKBRep $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/BREPImport/BREPImport.cxx b/src/BREPImport/BREPImport.cxx index d797ec8a0..cd78468ba 100644 --- a/src/BREPImport/BREPImport.cxx +++ b/src/BREPImport/BREPImport.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BREPImport.cxx // Created: Wed May 19 14:29:52 2004 @@ -58,6 +58,7 @@ extern "C" { BREPIMPORT_EXPORT TopoDS_Shape Import (const TCollection_AsciiString& theFileName, + const TCollection_AsciiString& /*theFormatName*/, TCollection_AsciiString& theError) { MESSAGE("Import BREP from file " << theFileName); diff --git a/src/BREPImport/Makefile.in b/src/BREPImport/Makefile.in index cc76e0c58..4656368c2 100644 --- a/src/BREPImport/Makefile.in +++ b/src/BREPImport/Makefile.in @@ -14,7 +14,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -37,9 +37,9 @@ LIB= libBREPImport.la LIB_SRC = BREPImport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKBRep -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKBRep $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/BasicGUI/BasicGUI.cxx b/src/BasicGUI/BasicGUI.cxx index e3d0f040e..d28511706 100644 --- a/src/BasicGUI/BasicGUI.cxx +++ b/src/BasicGUI/BasicGUI.cxx @@ -1,23 +1,23 @@ // GEOM GEOMGUI : GUI for Geometry component // // 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 +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -57,18 +57,13 @@ using namespace std; -BasicGUI* BasicGUI::myGUIObject = 0; - //======================================================================= // function : GetBasicGUI() // purpose : Get the only BasicGUI object [ static ] //======================================================================= BasicGUI* BasicGUI::GetBasicGUI( GeometryGUI* parent ) { - if ( myGUIObject == 0 ) { - myGUIObject = new BasicGUI( parent ); - } - return myGUIObject; + return new BasicGUI( parent ); } //======================================================================= @@ -80,7 +75,6 @@ BasicGUI::BasicGUI( GeometryGUI* parent ) : { } - //======================================================================= // function : ~BasicGUI() // purpose : Destructor diff --git a/src/BasicGUI/BasicGUI.h b/src/BasicGUI/BasicGUI.h index 9e086dd2c..0822236d6 100644 --- a/src/BasicGUI/BasicGUI.h +++ b/src/BasicGUI/BasicGUI.h @@ -1,30 +1,29 @@ // GEOM GEOMGUI : GUI for Geometry component // // 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 +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI.h // Author : Damien COQUERET // Module : GEOM -// $Header$ #ifndef BASICGUI_H #define BASICGUI_H @@ -44,7 +43,7 @@ class GEOM_BASICGUI_EXPORT BasicGUI : public GEOMGUI protected: BasicGUI( GeometryGUI* parent ); // hide constructor to avoid direct creation -public : +public: ~BasicGUI(); // Get the only BasicGUI object @@ -54,9 +53,6 @@ public : bool OnMousePress(QMouseEvent* pe, SUIT_Desktop* parent, SUIT_ViewWindow* theViewWindow); gp_Pnt ConvertClickToPoint( int x, int y, Handle(V3d_View) aView ); - -private: - static BasicGUI* myGUIObject; // the only BasicGUI object }; #endif diff --git a/src/BasicGUI/BasicGUI_ArcDlg.cxx b/src/BasicGUI/BasicGUI_ArcDlg.cxx index 07de548cd..15815209d 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.cxx +++ b/src/BasicGUI/BasicGUI_ArcDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -55,9 +55,8 @@ using namespace std; //================================================================================= BasicGUI_ArcDlg::BasicGUI_ArcDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - : GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | - WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), - myGeometryGUI(theGeometryGUI) + : GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ARC"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -86,6 +85,8 @@ BasicGUI_ArcDlg::BasicGUI_ArcDlg(GeometryGUI* theGeometryGUI, QWidget* parent, Layout1->addWidget( Group3Pnts, 2, 0 ); + setHelpFileName("arc.htm"); + Init(); } @@ -106,7 +107,7 @@ BasicGUI_ArcDlg::~BasicGUI_ArcDlg() void BasicGUI_ArcDlg::Init() { /* init variables */ - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); globalSelection( GEOM_POINT ); myEditCurrentArgument = Group3Pnts->LineEdit1; @@ -116,8 +117,8 @@ void BasicGUI_ArcDlg::Init() /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -253,7 +254,7 @@ void BasicGUI_ArcDlg::ActivateThisDialog() connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); globalSelection( GEOM_POINT ); myEditCurrentArgument = Group3Pnts->LineEdit1; @@ -271,7 +272,7 @@ void BasicGUI_ArcDlg::ActivateThisDialog() //================================================================================= void BasicGUI_ArcDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -291,7 +292,7 @@ void BasicGUI_ArcDlg::enterEvent(QEvent* e) //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_ArcDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); } //================================================================================= @@ -332,6 +333,5 @@ bool BasicGUI_ArcDlg::execute( ObjectList& objects ) //================================================================================= void BasicGUI_ArcDlg::closeEvent( QCloseEvent* e ) { - // myGeometryGUI->SetState( -1 ); GEOMBase_Skeleton::closeEvent( e ); } diff --git a/src/BasicGUI/BasicGUI_ArcDlg.h b/src/BasicGUI/BasicGUI_ArcDlg.h index 824bcf5ae..35038d452 100644 --- a/src/BasicGUI/BasicGUI_ArcDlg.h +++ b/src/BasicGUI/BasicGUI_ArcDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI_ArcDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_ARC_H #define DIALOGBOX_ARC_H @@ -43,7 +42,8 @@ class GEOM_BASICGUI_EXPORT BasicGUI_ArcDlg : public GEOMBase_Skeleton Q_OBJECT public: - BasicGUI_ArcDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + BasicGUI_ArcDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~BasicGUI_ArcDlg(); protected: @@ -58,8 +58,6 @@ private : void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint1, myPoint2, myPoint3; DlgRef_3Sel_QTD* Group3Pnts; diff --git a/src/BasicGUI/BasicGUI_CircleDlg.cxx b/src/BasicGUI/BasicGUI_CircleDlg.cxx index 8476ef36e..5bd907f71 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.cxx +++ b/src/BasicGUI/BasicGUI_CircleDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -46,9 +46,10 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BasicGUI_CircleDlg::BasicGUI_CircleDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), - myGeometryGUI(theGeometryGUI) +BasicGUI_CircleDlg::BasicGUI_CircleDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CIRCLE_PV"))); QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CIRCLE_PNTS"))); @@ -91,6 +92,8 @@ BasicGUI_CircleDlg::BasicGUI_CircleDlg(GeometryGUI* theGeometryGUI, QWidget* par Layout1->addWidget( Group3Pnts, 2, 0 ); /***************************************************************/ + setHelpFileName("circle.htm"); + Init(); } @@ -115,7 +118,7 @@ void BasicGUI_CircleDlg::Init() myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = GEOM::GEOM_Object::_nil(); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); /* Get setting of step value from file configuration */ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); @@ -127,8 +130,8 @@ void BasicGUI_CircleDlg::Init() /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -144,7 +147,7 @@ void BasicGUI_CircleDlg::Init() connect(GroupPntVecR->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); connect(GroupPntVecR->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPntVecR->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPntVecR->SpinBox_DX, SLOT(SetStep(double))); connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; @@ -318,7 +321,7 @@ void BasicGUI_CircleDlg::ActivateThisDialog() connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); ConstructorsClicked( getConstructorId() ); } @@ -340,7 +343,7 @@ void BasicGUI_CircleDlg::enterEvent(QEvent* e) //================================================================================= void BasicGUI_CircleDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -368,7 +371,7 @@ double BasicGUI_CircleDlg::getRadius() const //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_CircleDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); } //================================================================================= @@ -429,7 +432,6 @@ bool BasicGUI_CircleDlg::execute( ObjectList& objects ) //================================================================================= void BasicGUI_CircleDlg::closeEvent( QCloseEvent* e ) { - // myGeometryGUI->SetState( -1 ); GEOMBase_Skeleton::closeEvent( e ); } diff --git a/src/BasicGUI/BasicGUI_CircleDlg.h b/src/BasicGUI/BasicGUI_CircleDlg.h index 56ec4925a..82b87f137 100644 --- a/src/BasicGUI/BasicGUI_CircleDlg.h +++ b/src/BasicGUI/BasicGUI_CircleDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI_CircleDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_CIRCLE_H #define DIALOGBOX_CIRCLE_H @@ -41,12 +40,13 @@ // class : BasicGUI_CircleDlg // purpose : //================================================================================= -class GEOM_BASICGUI_EXPORT BasicGUI_CircleDlg : public GEOMBase_Skeleton -{ +class BasicGUI_CircleDlg : public GEOMBase_Skeleton +{ Q_OBJECT public: - BasicGUI_CircleDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BasicGUI_CircleDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BasicGUI_CircleDlg(); protected: @@ -57,13 +57,11 @@ protected: virtual void closeEvent( QCloseEvent* e ); -private : +private: void Init(); void enterEvent(QEvent* e); double getRadius() const; - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint, myDir, myPoint1, myPoint2, myPoint3; DlgRef_2Sel1Spin* GroupPntVecR; @@ -83,7 +81,6 @@ private slots: void LineEditReturnPressed(); void SetEditCurrentArgument(); void ValueChangedInSpinBox(); - }; #endif // DIALOGBOX_CIRCLE_H diff --git a/src/BasicGUI/BasicGUI_CurveDlg.cxx b/src/BasicGUI/BasicGUI_CurveDlg.cxx index a558a22f0..69a25e857 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.cxx +++ b/src/BasicGUI/BasicGUI_CurveDlg.cxx @@ -16,7 +16,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -51,18 +51,19 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BasicGUI_CurveDlg::BasicGUI_CurveDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), - myGeometryGUI(theGeometryGUI) +BasicGUI_CurveDlg::BasicGUI_CurveDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POLYLINE"))); QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SPLINE"))); QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BEZIER"))); - + QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); setCaption(tr("GEOM_CURVE_TITLE")); - + /***************************************************************/ RadioButton1->setPixmap( image0 ); RadioButton2->setPixmap( image3 ); @@ -72,12 +73,14 @@ BasicGUI_CurveDlg::BasicGUI_CurveDlg(GeometryGUI* theGeometryGUI, QWidget* paren GroupPoints->GroupBox1->setTitle( tr( "GEOM_NODES" ) ); GroupPoints->TextLabel1->setText( tr("GEOM_POINTS") ); GroupPoints->PushButton1->setPixmap(image1); - + GroupPoints->LineEdit1->setReadOnly( true ); Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("curve.htm"); + Init(); } @@ -107,8 +110,8 @@ void BasicGUI_CurveDlg::Init() /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -309,7 +312,7 @@ void BasicGUI_CurveDlg::ActivateThisDialog() connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); globalSelection( GEOM_POINT ); ConstructorsClicked( getConstructorId() ); @@ -321,7 +324,7 @@ void BasicGUI_CurveDlg::ActivateThisDialog() //================================================================================= void BasicGUI_CurveDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -341,7 +344,7 @@ void BasicGUI_CurveDlg::enterEvent(QEvent* e) //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_CurveDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); } //================================================================================= @@ -391,7 +394,6 @@ bool BasicGUI_CurveDlg::execute( ObjectList& objects ) //================================================================================= void BasicGUI_CurveDlg::closeEvent( QCloseEvent* e ) { - // myGeometryGUI->SetState( -1 ); GEOMBase_Skeleton::closeEvent( e ); } diff --git a/src/BasicGUI/BasicGUI_CurveDlg.h b/src/BasicGUI/BasicGUI_CurveDlg.h index e09431ae4..6a1b6fa9b 100644 --- a/src/BasicGUI/BasicGUI_CurveDlg.h +++ b/src/BasicGUI/BasicGUI_CurveDlg.h @@ -16,14 +16,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI_CurveDlg.h // Author : Alexander SLADKOV // Module : GEOM -// $Header$ #ifndef BASICGUI_CURVE_H #define BASICGUI_CURVE_H @@ -34,6 +33,7 @@ #include "DlgRef_1Sel_QTD.h" #include "BasicGUI.h" + #include //================================================================================= @@ -45,7 +45,8 @@ class GEOM_BASICGUI_EXPORT BasicGUI_CurveDlg : public GEOMBase_Skeleton Q_OBJECT public: - BasicGUI_CurveDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BasicGUI_CurveDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BasicGUI_CurveDlg(); protected: @@ -60,8 +61,6 @@ private : void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - DlgRef_1Sel_QTD* GroupPoints; GEOM::ListOfGO_var myPoints; list myOrderedSel;//!< This list used for managing orderes selection diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.cxx b/src/BasicGUI/BasicGUI_EllipseDlg.cxx index 273d3267a..0aa2d0da7 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.cxx +++ b/src/BasicGUI/BasicGUI_EllipseDlg.cxx @@ -16,7 +16,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -47,14 +47,16 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BasicGUI_EllipseDlg::BasicGUI_EllipseDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +BasicGUI_EllipseDlg::BasicGUI_EllipseDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ELLIPSE_PV"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); setCaption(tr("GEOM_ELLIPSE_TITLE")); - + /***************************************************************/ GroupConstructors->setTitle(tr("GEOM_ELLIPSE")); RadioButton1->setPixmap(image0); @@ -76,6 +78,8 @@ BasicGUI_EllipseDlg::BasicGUI_EllipseDlg(GeometryGUI* theGeometryGUI, QWidget* p Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("ellipse.htm"); + Init(); } @@ -101,7 +105,7 @@ void BasicGUI_EllipseDlg::Init() myPoint = myDir = GEOM::GEOM_Object::_nil(); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); /* Get setting of step value from file configuration */ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); @@ -117,8 +121,8 @@ void BasicGUI_EllipseDlg::Init() /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -132,8 +136,8 @@ void BasicGUI_EllipseDlg::Init() connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupPoints->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; @@ -272,7 +276,7 @@ void BasicGUI_EllipseDlg::ActivateThisDialog() //================================================================================= void BasicGUI_EllipseDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -301,7 +305,7 @@ void BasicGUI_EllipseDlg::ValueChangedInSpinBox(double newValue) //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_EllipseDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetICurvesOperations( getStudyId() ); } //================================================================================= @@ -342,7 +346,6 @@ bool BasicGUI_EllipseDlg::execute( ObjectList& objects ) //================================================================================= void BasicGUI_EllipseDlg::closeEvent( QCloseEvent* e ) { - // myGeometryGUI->SetState( -1 ); GEOMBase_Skeleton::closeEvent( e ); } diff --git a/src/BasicGUI/BasicGUI_EllipseDlg.h b/src/BasicGUI/BasicGUI_EllipseDlg.h index 014070aa6..038700f53 100644 --- a/src/BasicGUI/BasicGUI_EllipseDlg.h +++ b/src/BasicGUI/BasicGUI_EllipseDlg.h @@ -16,14 +16,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI_EllipseDlg.h // Author : Nicolas REJNERI // Module : GEOM -// $Header$ #ifndef BASICGUI_ELLIPSE_H #define BASICGUI_ELLIPSE_H @@ -44,7 +43,8 @@ class GEOM_BASICGUI_EXPORT BasicGUI_EllipseDlg : public GEOMBase_Skeleton Q_OBJECT public: - BasicGUI_EllipseDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BasicGUI_EllipseDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BasicGUI_EllipseDlg(); protected: @@ -59,8 +59,6 @@ private : void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint, myDir; DlgRef_2Sel2Spin* GroupPoints; diff --git a/src/BasicGUI/BasicGUI_LineDlg.cxx b/src/BasicGUI/BasicGUI_LineDlg.cxx index 014f7e18c..f71fc7a18 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.cxx +++ b/src/BasicGUI/BasicGUI_LineDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -48,8 +48,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BasicGUI_LineDlg::BasicGUI_LineDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +BasicGUI_LineDlg::BasicGUI_LineDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_DLG_LINE_2P"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_SELECT"))); @@ -75,6 +77,8 @@ BasicGUI_LineDlg::BasicGUI_LineDlg(GeometryGUI* theGeometryGUI, QWidget* parent, Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("line.htm"); + Init(); } @@ -99,13 +103,13 @@ void BasicGUI_LineDlg::Init() myPoint1 = myPoint2 = GEOM::GEOM_Object::_nil(); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); globalSelection( GEOM_POINT ); /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -223,7 +227,7 @@ void BasicGUI_LineDlg::ActivateThisDialog() connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); globalSelection( GEOM_POINT ); myEditCurrentArgument = GroupPoints->LineEdit1; @@ -240,7 +244,7 @@ void BasicGUI_LineDlg::ActivateThisDialog() //================================================================================= void BasicGUI_LineDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -260,7 +264,7 @@ void BasicGUI_LineDlg::enterEvent(QEvent* e) //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_LineDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); } //================================================================================= @@ -290,7 +294,6 @@ bool BasicGUI_LineDlg::execute( ObjectList& objects ) //================================================================================= void BasicGUI_LineDlg::closeEvent( QCloseEvent* e ) { - // myGeometryGUI->SetState( -1 ); GEOMBase_Skeleton::closeEvent( e ); } diff --git a/src/BasicGUI/BasicGUI_LineDlg.h b/src/BasicGUI/BasicGUI_LineDlg.h index 943053d74..65eba2b98 100644 --- a/src/BasicGUI/BasicGUI_LineDlg.h +++ b/src/BasicGUI/BasicGUI_LineDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI_LineDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_LINE_H #define DIALOGBOX_LINE_H @@ -43,7 +42,8 @@ class GEOM_BASICGUI_EXPORT BasicGUI_LineDlg : public GEOMBase_Skeleton Q_OBJECT public: - BasicGUI_LineDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BasicGUI_LineDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BasicGUI_LineDlg(); protected: @@ -58,8 +58,6 @@ private : void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint1; GEOM::GEOM_Object_var myPoint2; diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.cxx b/src/BasicGUI/BasicGUI_MarkerDlg.cxx index faf073950..521d2a742 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.cxx +++ b/src/BasicGUI/BasicGUI_MarkerDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -58,8 +58,8 @@ // purpose : Constructor //================================================================================= BasicGUI_MarkerDlg::BasicGUI_MarkerDlg( GeometryGUI* theGeometryGUI, QWidget* theParent ) -: GEOMBase_Skeleton( theParent, "BasicGUI_MarkerDlg", false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) + : GEOMBase_Skeleton(theGeometryGUI, theParent, "BasicGUI_MarkerDlg", false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap iconCS1 ( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_MARKER" ) ) ); QPixmap iconCS2 ( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_MARKER2" ) ) ); @@ -119,6 +119,8 @@ BasicGUI_MarkerDlg::BasicGUI_MarkerDlg( GeometryGUI* theGeometryGUI, QWidget* th Layout1->addWidget( Group1, 2, 0 ); Layout1->addWidget( Group2, 2, 0 ); + setHelpFileName("local_coordinate_system.htm"); + Init(); } @@ -158,8 +160,8 @@ void BasicGUI_MarkerDlg::Init() connect(Group2->LineEdit3, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( onClose() ) ); - connect( myGeometryGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( onDeactivate() ) ); - connect( myGeometryGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( onClose() ) ); + connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( onDeactivate() ) ); + connect( myGeomGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( onClose() ) ); connect( buttonOk, SIGNAL( clicked() ), this, SLOT( onOk() ) ); connect( buttonApply, SIGNAL( clicked() ), this, SLOT( onApply() ) ); @@ -320,7 +322,7 @@ void BasicGUI_MarkerDlg::onSelectionDone0() if ( aRes && !aSelectedObj->_is_nil() ) { TopoDS_Shape aShape; - if ( myGeomBase->GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) + if ( GEOMBase::GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) && !aShape.IsNull() ) { if ( aSelectedObj->GetType() == GEOM_MARKER && aShape.ShapeType() == TopAbs_FACE ) { @@ -402,7 +404,7 @@ void BasicGUI_MarkerDlg::onSelectionDone() if ( !CORBA::is_nil( aSelectedObj ) && aRes ) { aName = GEOMBase::GetName( aSelectedObj ); TopoDS_Shape aShape; - if ( myGeomBase->GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) ) { + if ( GEOMBase::GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) ) { GEOM::short_array anIndexes; TColStd_IndexedMapOfInteger aMap; @@ -643,7 +645,7 @@ void BasicGUI_MarkerDlg::enterEvent(QEvent* e) //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_MarkerDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); } //================================================================================= diff --git a/src/BasicGUI/BasicGUI_MarkerDlg.h b/src/BasicGUI/BasicGUI_MarkerDlg.h index 6d096ac4b..7ba75b60b 100644 --- a/src/BasicGUI/BasicGUI_MarkerDlg.h +++ b/src/BasicGUI/BasicGUI_MarkerDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI_MarkerDlg.h // Author : Sergey LITONIN // Module : GEOM -// $Header$ #ifndef DIALOGBOX_Marker_H #define DIALOGBOX_Marker_H @@ -62,12 +61,10 @@ protected: const bool toRemoveFromEngine = true, const double lineWidth = -1 ); -private : +private: void enterEvent( QEvent* e ); void onSelectionDone0(); - GeometryGUI* myGeometryGUI; - private slots: void onOk(); void onClose(); diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.cxx b/src/BasicGUI/BasicGUI_PlaneDlg.cxx index 544f2611d..22975fe58 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_PlaneDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -46,8 +46,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BasicGUI_PlaneDlg::BasicGUI_PlaneDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +BasicGUI_PlaneDlg::BasicGUI_PlaneDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PLANE_PV"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PLANE_3PNTS"))); @@ -99,6 +101,8 @@ BasicGUI_PlaneDlg::BasicGUI_PlaneDlg(GeometryGUI* theGeometryGUI, QWidget* paren Layout1->addWidget(GroupFace, 2, 0); /***************************************************************/ + setHelpFileName("plane.htm"); + Init(); } @@ -123,7 +127,7 @@ void BasicGUI_PlaneDlg::Init() myPoint = myDir = myPoint1 = myPoint2 = myPoint3 = myFace = GEOM::GEOM_Object::_nil(); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); /* Get setting of step value from file configuration */ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); @@ -141,8 +145,8 @@ void BasicGUI_PlaneDlg::Init() /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -166,9 +170,9 @@ void BasicGUI_PlaneDlg::Init() connect(Group3Pnts->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupFace->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPntDir->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group3Pnts->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupFace->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPntDir->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), Group3Pnts->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupFace->SpinBox_DX, SLOT(SetStep(double))); connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); @@ -373,7 +377,7 @@ void BasicGUI_PlaneDlg::ActivateThisDialog() connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); ConstructorsClicked( getConstructorId() ); } @@ -384,7 +388,7 @@ void BasicGUI_PlaneDlg::ActivateThisDialog() //================================================================================= void BasicGUI_PlaneDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -429,7 +433,7 @@ double BasicGUI_PlaneDlg::getSize() const //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_PlaneDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); } //================================================================================= @@ -501,7 +505,6 @@ bool BasicGUI_PlaneDlg::execute( ObjectList& objects ) //================================================================================= void BasicGUI_PlaneDlg::closeEvent( QCloseEvent* e ) { - // myGeometryGUI->SetState( -1 ); GEOMBase_Skeleton::closeEvent( e ); } diff --git a/src/BasicGUI/BasicGUI_PlaneDlg.h b/src/BasicGUI/BasicGUI_PlaneDlg.h index af874bbcc..05e8c69ec 100644 --- a/src/BasicGUI/BasicGUI_PlaneDlg.h +++ b/src/BasicGUI/BasicGUI_PlaneDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI_PlaneDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_PLANE_H #define DIALOGBOX_PLANE_H @@ -45,9 +44,10 @@ class GEOM_BASICGUI_EXPORT BasicGUI_PlaneDlg : public GEOMBase_Skeleton Q_OBJECT public: - BasicGUI_PlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BasicGUI_PlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BasicGUI_PlaneDlg(); - + protected: // redefined from GEOMBase_Helper virtual GEOM::GEOM_IOperations_ptr createOperation(); @@ -61,8 +61,6 @@ private : void enterEvent(QEvent* e); double getSize() const; - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint, myDir, myPoint1, myPoint2, myPoint3, myFace; DlgRef_2Sel1Spin* GroupPntDir; diff --git a/src/BasicGUI/BasicGUI_PointDlg.cxx b/src/BasicGUI/BasicGUI_PointDlg.cxx index e21f745ec..a194408cc 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.cxx +++ b/src/BasicGUI/BasicGUI_PointDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -57,8 +57,9 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BasicGUI_PointDlg::BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, fl ), myGeometryGUI(theGeometryGUI) +BasicGUI_PointDlg::BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl ) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POINT"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POINT_EDGE"))); @@ -121,15 +122,17 @@ BasicGUI_PointDlg::BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* paren myX->setPalette( aPal ); myY->setPalette( aPal ); myZ->setPalette( aPal ); + + setHelpFileName("point.htm"); Init(); } -//======================================================================= +//================================================================================= // function : ~BasicGUI_PointDlg() // purpose : Destructor -//======================================================================= +//================================================================================= BasicGUI_PointDlg::~BasicGUI_PointDlg() { } @@ -149,8 +152,6 @@ void BasicGUI_PointDlg::Init() myEditCurrentArgument = 0; - // myGeometryGUI->SetState( 0 ); - /* Get setting of step value from file configuration */ SUIT_ResourceMgr* resMgr = SUIT_Session::session()->resourceMgr(); double step = resMgr->doubleValue( "Geometry", "SettingsGeomStep", 100); @@ -176,8 +177,8 @@ void BasicGUI_PointDlg::Init() /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -194,13 +195,13 @@ void BasicGUI_PointDlg::Init() connect(GroupRefPoint->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupRefPoint->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupOnCurve->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DZ, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DZ, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupOnCurve->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupXYZ->SpinBox_DZ, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupRefPoint->SpinBox_DZ, SLOT(SetStep(double))); connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); @@ -303,10 +304,10 @@ bool BasicGUI_PointDlg::ClickOnApply() } -//======================================================================= +//================================================================================= // function : ClickOnCancel() // purpose : -//======================================================================= +//================================================================================= void BasicGUI_PointDlg::ClickOnCancel() { GEOMBase_Skeleton::ClickOnCancel(); @@ -322,66 +323,68 @@ void BasicGUI_PointDlg::SelectionIntoArgument() const int id = getConstructorId(); if ( ( id == 1 || id == 2 ) && myEditCurrentArgument != 0 ) - { - myEditCurrentArgument->setText(""); - myX->setText( "" ); - myY->setText( "" ); - myZ->setText( "" ); - myRefPoint = myEdge = GEOM::GEOM_Object::_nil(); - } - + { + myEditCurrentArgument->setText(""); + myX->setText( "" ); + myY->setText( "" ); + myZ->setText( "" ); + myRefPoint = myEdge = GEOM::GEOM_Object::_nil(); + } + if ( IObjectCount() == 1 ) + { + Standard_Boolean aRes = Standard_False; + Handle(SALOME_InteractiveObject) anIO = firstIObject(); + GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes ); + if ( !CORBA::is_nil( aSelectedObject ) && aRes ) { - Standard_Boolean aRes = Standard_False; - Handle(SALOME_InteractiveObject) anIO = firstIObject(); - GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject( anIO, aRes ); - if ( !CORBA::is_nil( aSelectedObject ) && aRes ) - { - if ( id == 0 ) - { - // get CORBA reference to data object - TopoDS_Shape aShape = myGeometryGUI->GetShapeReader().GetShape( myGeometryGUI->GetGeomGen(), aSelectedObject ); - if ( aShape.IsNull() ) - return; - - if ( aShape.ShapeType() != TopAbs_VERTEX ) - { - TColStd_IndexedMapOfInteger aMap; - - ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( anIO, aMap ); - - if ( aMap.Extent() == 1 ) - { - int anIndex = aMap( 1 ); - TopTools_IndexedMapOfShape aShapes; - TopExp::MapShapes( aShape, aShapes ); - aShape = aShapes.FindKey( anIndex ); - - if ( aShape.IsNull() || aShape.ShapeType() != TopAbs_VERTEX ) - return; - } - else - return; - } - - gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) ); - GroupXYZ->SpinBox_DX->SetValue( aPnt.X() ); - GroupXYZ->SpinBox_DY->SetValue( aPnt.Y() ); - GroupXYZ->SpinBox_DZ->SetValue( aPnt.Z() ); - } - else if ( id == 1 ) - { - myRefPoint = aSelectedObject; - GroupRefPoint->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) ); - } - else if ( id == 2 ) - { - myEdge = aSelectedObject; - GroupOnCurve->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) ); - } - } + if ( id == 0 ) + { + // get CORBA reference to data object + TopoDS_Shape aShape = myGeomGUI->GetShapeReader().GetShape + ( myGeomGUI->GetGeomGen(), aSelectedObject ); + if ( aShape.IsNull() ) + return; + + if ( aShape.ShapeType() != TopAbs_VERTEX ) + { + TColStd_IndexedMapOfInteger aMap; + LightApp_Application* anApp = + (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + anApp->selectionMgr()->GetIndexes( anIO, aMap ); + + if ( aMap.Extent() == 1 ) + { + int anIndex = aMap( 1 ); + TopTools_IndexedMapOfShape aShapes; + TopExp::MapShapes( aShape, aShapes ); + aShape = aShapes.FindKey( anIndex ); + + if ( aShape.IsNull() || aShape.ShapeType() != TopAbs_VERTEX ) + return; + } + else + return; + } + + gp_Pnt aPnt = BRep_Tool::Pnt( TopoDS::Vertex( aShape ) ); + GroupXYZ->SpinBox_DX->SetValue( aPnt.X() ); + GroupXYZ->SpinBox_DY->SetValue( aPnt.Y() ); + GroupXYZ->SpinBox_DZ->SetValue( aPnt.Z() ); + } + else if ( id == 1 ) + { + myRefPoint = aSelectedObject; + GroupRefPoint->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) ); + } + else if ( id == 2 ) + { + myEdge = aSelectedObject; + GroupOnCurve->LineEdit1->setText( GEOMBase::GetName( aSelectedObject ) ); + } } - + } + displayPreview(); } @@ -444,7 +447,7 @@ void BasicGUI_PointDlg::enterEvent(QEvent* e) void BasicGUI_PointDlg::ActivateThisDialog( ) { GEOMBase_Skeleton::ActivateThisDialog(); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); ConstructorsClicked( getConstructorId() ); } @@ -455,7 +458,7 @@ void BasicGUI_PointDlg::ActivateThisDialog( ) //================================================================================= void BasicGUI_PointDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -469,10 +472,10 @@ void BasicGUI_PointDlg::ValueChangedInSpinBox(double newValue) displayPreview(); } -//======================================================================= +//================================================================================= // funcion : getParameter() // purpose : -//======================================================================= +//================================================================================= double BasicGUI_PointDlg::getParameter() const { return GroupOnCurve->SpinBox_DX->GetValue(); @@ -500,7 +503,7 @@ void BasicGUI_PointDlg::OnPointSelected( const gp_Pnt& thePnt ) //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_PointDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); } //================================================================================= @@ -547,12 +550,14 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects ) double dy = GroupRefPoint->SpinBox_DY->GetValue(); double dz = GroupRefPoint->SpinBox_DZ->GetValue(); - anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePointWithReference( myRefPoint, dx, dy, dz ); + anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )-> + MakePointWithReference( myRefPoint, dx, dy, dz ); res = true; break; } case 2 : - anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )->MakePointOnCurve( myEdge, getParameter() ); + anObj = GEOM::GEOM_IBasicOperations::_narrow( getOperation() )-> + MakePointOnCurve( myEdge, getParameter() ); res = true; break; } @@ -590,6 +595,5 @@ bool BasicGUI_PointDlg::execute( ObjectList& objects ) //================================================================================= void BasicGUI_PointDlg::closeEvent( QCloseEvent* e ) { - // myGeometryGUI->SetState( -1 ); GEOMBase_Skeleton::closeEvent( e ); } diff --git a/src/BasicGUI/BasicGUI_PointDlg.h b/src/BasicGUI/BasicGUI_PointDlg.h index 4372cff28..5d9e7cd7f 100644 --- a/src/BasicGUI/BasicGUI_PointDlg.h +++ b/src/BasicGUI/BasicGUI_PointDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI_PointDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_POINT_H #define DIALOGBOX_POINT_H @@ -48,13 +47,14 @@ class GEOM_BASICGUI_EXPORT BasicGUI_PointDlg : public GEOMBase_Skeleton Q_OBJECT public: - BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BasicGUI_PointDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BasicGUI_PointDlg(); bool acceptMouseEvent() const { return ( getConstructorId() == 0 ); }; void OnPointSelected( const gp_Pnt& ); // called by BasicGUI::OnMousePress() - + protected: // redefined from GEOMBase_Helper virtual GEOM::GEOM_IOperations_ptr createOperation(); @@ -68,8 +68,6 @@ private : void enterEvent(QEvent* e); double getParameter() const; - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myEdge; GEOM::GEOM_Object_var myRefPoint; diff --git a/src/BasicGUI/BasicGUI_VectorDlg.cxx b/src/BasicGUI/BasicGUI_VectorDlg.cxx index 8860b2e48..ab7a81556 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.cxx +++ b/src/BasicGUI/BasicGUI_VectorDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -48,15 +48,16 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BasicGUI_VectorDlg::BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, fl ), myGeometryGUI(theGeometryGUI) +BasicGUI_VectorDlg::BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_VECTOR_2P"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_VECTOR_DXYZ"))); QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); setCaption(tr("GEOM_VECTOR_TITLE")); - + /***************************************************************/ GroupConstructors->setTitle(tr("GEOM_VECTOR")); RadioButton1->setPixmap(image0); @@ -84,6 +85,8 @@ BasicGUI_VectorDlg::BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* par Layout1->addWidget(GroupDimensions, 2, 0); /***************************************************************/ + setHelpFileName("vector.htm"); + /* Initialisations */ Init(); } @@ -128,8 +131,8 @@ void BasicGUI_VectorDlg::Init() /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -145,9 +148,9 @@ void BasicGUI_VectorDlg::Init() connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double))); connect(GroupDimensions->CheckBox1, SIGNAL(stateChanged(int)), this, SLOT(ReverseVector(int))); @@ -323,7 +326,7 @@ void BasicGUI_VectorDlg::ActivateThisDialog() //================================================================================= void BasicGUI_VectorDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -369,7 +372,7 @@ void BasicGUI_VectorDlg::ReverseVector(int state) //================================================================================= GEOM::GEOM_IOperations_ptr BasicGUI_VectorDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetIBasicOperations( getStudyId() ); } //================================================================================= diff --git a/src/BasicGUI/BasicGUI_VectorDlg.h b/src/BasicGUI/BasicGUI_VectorDlg.h index 04f45957c..a9dcb51b8 100644 --- a/src/BasicGUI/BasicGUI_VectorDlg.h +++ b/src/BasicGUI/BasicGUI_VectorDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BasicGUI_VectorDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_VECTOR_H #define DIALOGBOX_VECTOR_H @@ -46,9 +45,10 @@ class GEOM_BASICGUI_EXPORT BasicGUI_VectorDlg : public GEOMBase_Skeleton Q_OBJECT public: - BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BasicGUI_VectorDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BasicGUI_VectorDlg(); - + protected: // redefined from GEOMBase_Helper virtual GEOM::GEOM_IOperations_ptr createOperation(); @@ -59,8 +59,6 @@ private : void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint1; GEOM::GEOM_Object_var myPoint2; @@ -71,7 +69,7 @@ private slots: void ClickOnOk(); void ClickOnCancel(); bool ClickOnApply(); - + void ActivateThisDialog(); void DeactivateActiveDialog(); diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx index 168c8bc7b..5fc545257 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -61,8 +61,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg(GeometryGUI* theGeometryGUI , QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_WPLANE_FACE"))); @@ -103,6 +105,8 @@ BasicGUI_WorkingPlaneDlg::BasicGUI_WorkingPlaneDlg(GeometryGUI* theGeometryGUI , Layout1->addWidget(Group3, 1, 0); /***************************************************************/ + setHelpFileName("working_plane.htm"); + Init(); } @@ -122,9 +126,9 @@ void BasicGUI_WorkingPlaneDlg::Init() { /* init variables */ myEditCurrentArgument = Group1->LineEdit1; - myWPlane = myGeometryGUI->GetWorkingPlane(); + myWPlane = myGeomGUI->GetWorkingPlane(); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); myFace = GEOM::GEOM_Object::_nil(); myVectX = GEOM::GEOM_Object::_nil(); @@ -137,8 +141,8 @@ void BasicGUI_WorkingPlaneDlg::Init() /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int))); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); @@ -168,7 +172,7 @@ void BasicGUI_WorkingPlaneDlg::Init() void BasicGUI_WorkingPlaneDlg::ConstructorsClicked(int constructorId) { disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0); - // myGeometryGUI->SetState( 0 ); + // myGeomGUI->SetState( 0 ); switch (constructorId) { @@ -249,7 +253,7 @@ void BasicGUI_WorkingPlaneDlg::ClickOnOk() bool BasicGUI_WorkingPlaneDlg::ClickOnApply() { buttonApply->setFocus(); - myGeometryGUI->application()->putInfo(tr("")); + myGeomGUI->application()->putInfo(tr("")); const int id = getConstructorId(); if (id == 0) { @@ -262,8 +266,8 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply() gp_Pln aPln = aGPlane->Pln(); myWPlane = aPln.Position(); - myGeometryGUI->SetWorkingPlane(myWPlane); - myGeometryGUI->ActiveWorkingPlane(); + myGeomGUI->SetWorkingPlane(myWPlane); + myGeomGUI->ActiveWorkingPlane(); return true; } } @@ -305,8 +309,8 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply() myWPlane = gp_Ax3(BRep_Tool::Pnt(V1), aDirZ, aDirX); - myGeometryGUI->SetWorkingPlane(myWPlane); - myGeometryGUI->ActiveWorkingPlane(); + myGeomGUI->SetWorkingPlane(myWPlane); + myGeomGUI->ActiveWorkingPlane(); return true; } } else if (id == 2) { @@ -328,8 +332,8 @@ bool BasicGUI_WorkingPlaneDlg::ClickOnApply() myWPlane = gp_Ax3(P1, aDirZ, aDirX); - myGeometryGUI->SetWorkingPlane(myWPlane); - myGeometryGUI->ActiveWorkingPlane(); + myGeomGUI->SetWorkingPlane(myWPlane); + myGeomGUI->ActiveWorkingPlane(); return true; } return false; @@ -434,7 +438,7 @@ void BasicGUI_WorkingPlaneDlg::ActivateThisDialog( ) //================================================================================= void BasicGUI_WorkingPlaneDlg::DeactivateActiveDialog() { - // myGeometryGUI->SetState( -1 ); + // myGeomGUI->SetState( -1 ); GEOMBase_Skeleton::DeactivateActiveDialog(); } @@ -463,6 +467,5 @@ void BasicGUI_WorkingPlaneDlg::enterEvent(QEvent* e) //================================================================================= void BasicGUI_WorkingPlaneDlg::closeEvent( QCloseEvent* e ) { - // myGeometryGUI->SetState( -1 ); GEOMBase_Skeleton::closeEvent( e ); } diff --git a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h index b12233c6e..35561c741 100644 --- a/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h +++ b/src/BasicGUI/BasicGUI_WorkingPlaneDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -44,7 +44,8 @@ class GEOM_BASICGUI_EXPORT BasicGUI_WorkingPlaneDlg : public GEOMBase_Skeleton Q_OBJECT public: - BasicGUI_WorkingPlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); + BasicGUI_WorkingPlaneDlg( GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); ~BasicGUI_WorkingPlaneDlg(); virtual void closeEvent( QCloseEvent* e ); @@ -52,8 +53,6 @@ private: void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myFace; GEOM::GEOM_Object_var myVectX; GEOM::GEOM_Object_var myVectZ; diff --git a/src/BasicGUI/Makefile.in b/src/BasicGUI/Makefile.in index 331c25944..83f50ff0e 100644 --- a/src/BasicGUI/Makefile.in +++ b/src/BasicGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -71,8 +71,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase -lGEOM diff --git a/src/BlocksGUI/BlocksGUI.cxx b/src/BlocksGUI/BlocksGUI.cxx index e83aa1739..66ad69008 100644 --- a/src/BlocksGUI/BlocksGUI.cxx +++ b/src/BlocksGUI/BlocksGUI.cxx @@ -16,7 +16,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -30,7 +30,6 @@ #include "BlocksGUI_QuadFaceDlg.h" #include "BlocksGUI_BlockDlg.h" #include "BlocksGUI_TrsfDlg.h" -//#include "BlocksGUI_CheckMultiBlockDlg.h" #include "BlocksGUI_ExplodeDlg.h" #include "BlocksGUI_PropagateDlg.h" @@ -40,6 +39,8 @@ #include "SUIT_MessageBox.h" #include "SUIT_Session.h" +#include "SalomeApp_Application.h" + BlocksGUI* BlocksGUI::myGUIObject = 0; //======================================================================= @@ -83,35 +84,13 @@ bool BlocksGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) switch (theCommandID) { - case 9999: - aDlg = new BlocksGUI_BlockDlg (parent); - break; - - case 9998: - aDlg = new BlocksGUI_TrsfDlg (parent); - break; - - case 9997: - aDlg = new BlocksGUI_QuadFaceDlg (parent); - break; - - case 9996: -// aDlg = new BlocksGUI_CheckMultiBlockDlg (parent, Sel); - SUIT_MessageBox::warn1 (parent, - QObject::tr("WRN_WARNING"), - QObject::tr("WRN_NOT_IMPLEMENTED"), - QObject::tr("BUT_OK")); - break; - - case 9995: - aDlg = new BlocksGUI_ExplodeDlg (parent); - break; - case 99991: - aDlg = new BlocksGUI_PropagateDlg (parent, ""); - break; - + case 9999: aDlg = new BlocksGUI_BlockDlg (getGeometryGUI(), parent); break; + case 9998: aDlg = new BlocksGUI_TrsfDlg (getGeometryGUI(), parent); break; + case 9997: aDlg = new BlocksGUI_QuadFaceDlg (getGeometryGUI(), parent); break; + case 9995: aDlg = new BlocksGUI_ExplodeDlg (getGeometryGUI(), parent); break; + case 99991: aDlg = new BlocksGUI_PropagateDlg (getGeometryGUI(), parent); break; default: - SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); + getGeometryGUI()->getApp()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); break; } diff --git a/src/BlocksGUI/BlocksGUI.h b/src/BlocksGUI/BlocksGUI.h index 043834d8d..21430bf2c 100644 --- a/src/BlocksGUI/BlocksGUI.h +++ b/src/BlocksGUI/BlocksGUI.h @@ -16,7 +16,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx index 5d0444ea4..cc7876a36 100644 --- a/src/BlocksGUI/BlocksGUI_BlockDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_BlockDlg.cxx @@ -16,7 +16,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -41,9 +41,8 @@ using namespace std; // class : BlocksGUI_BlockDlg() // purpose : Constructs a BlocksGUI_BlockDlg which is a child of 'parent'. //================================================================================= -BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (QWidget* parent, - bool modal) - : GEOMBase_Skeleton(parent, "BlockDlg", modal, +BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal) + : GEOMBase_Skeleton(theGeometryGUI, parent, "BlockDlg", modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_2F"))); @@ -88,6 +87,8 @@ BlocksGUI_BlockDlg::BlocksGUI_BlockDlg (QWidget* parent, Layout1->addWidget(Group6F, 2, 0); /***************************************************************/ + setHelpFileName("newentity_blocks.htm#HexahedralSolid"); + Init(); } @@ -327,15 +328,6 @@ void BlocksGUI_BlockDlg::enterEvent (QEvent* e) ActivateThisDialog(); } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -//void BlocksGUI_BlockDlg::DeactivateActiveDialog() -//{ -// GEOMBase_Skeleton::DeactivateActiveDialog(); -//} - //================================================================================= // function : createOperation // purpose : diff --git a/src/BlocksGUI/BlocksGUI_BlockDlg.h b/src/BlocksGUI/BlocksGUI_BlockDlg.h index eafe79918..92801ac05 100644 --- a/src/BlocksGUI/BlocksGUI_BlockDlg.h +++ b/src/BlocksGUI/BlocksGUI_BlockDlg.h @@ -16,14 +16,13 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BlocksGUI_BlockDlg.h // Author : Julia DOROVSKIKH // Module : GEOM -// $Header$ #ifndef DIALOGBOX_BLOCK_H #define DIALOGBOX_BLOCK_H @@ -44,7 +43,7 @@ class GEOM_BLOCKSGUI_EXPORT BlocksGUI_BlockDlg : public GEOMBase_Skeleton Q_OBJECT public: - BlocksGUI_BlockDlg (QWidget* parent, + BlocksGUI_BlockDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal = FALSE); ~BlocksGUI_BlockDlg(); @@ -71,7 +70,6 @@ private slots: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); -// void DeactivateActiveDialog(); void ConstructorsClicked (int constructorId); void SelectionIntoArgument(); diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx index 728082a4e..d8ec38847 100644 --- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.cxx @@ -16,7 +16,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -50,9 +50,8 @@ // class : BlocksGUI_ExplodeDlg() // purpose : Constructs a BlocksGUI_ExplodeDlg which is a child of 'parent'. //================================================================================= -BlocksGUI_ExplodeDlg::BlocksGUI_ExplodeDlg (QWidget* parent, - bool modal) - : GEOMBase_Skeleton(parent, "ExplodeDlg", modal, +BlocksGUI_ExplodeDlg::BlocksGUI_ExplodeDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal) + : GEOMBase_Skeleton(theGeometryGUI, parent, "ExplodeDlg", modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_EXPLODE"))); @@ -108,6 +107,8 @@ BlocksGUI_ExplodeDlg::BlocksGUI_ExplodeDlg (QWidget* parent, Layout1->addWidget(myGrp1, 1, 0); /***************************************************************/ + setHelpFileName("explode_on_blocks.htm"); + Init(); } diff --git a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h index d8a7993e9..8e309ecfd 100644 --- a/src/BlocksGUI/BlocksGUI_ExplodeDlg.h +++ b/src/BlocksGUI/BlocksGUI_ExplodeDlg.h @@ -16,14 +16,13 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BlocksGUI_ExplodeDlg.h // Author : Julia DOROVSKIKH // Module : GEOM -// $Header$ #ifndef DIALOGBOX_BLOCK_EXPLODE_H #define DIALOGBOX_BLOCK_EXPLODE_H @@ -45,8 +44,7 @@ class GEOM_BLOCKSGUI_EXPORT BlocksGUI_ExplodeDlg : public GEOMBase_Skeleton Q_OBJECT public: - BlocksGUI_ExplodeDlg (QWidget* parent, - bool modal = FALSE); + BlocksGUI_ExplodeDlg (GeometryGUI*, QWidget* parent, bool modal = FALSE); ~BlocksGUI_ExplodeDlg(); protected: diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx index 0c4bdc44b..e126dcf05 100644 --- a/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -46,8 +46,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BlocksGUI_PropagateDlg::BlocksGUI_PropagateDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +BlocksGUI_PropagateDlg::BlocksGUI_PropagateDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PROPAGATE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -75,10 +77,11 @@ BlocksGUI_PropagateDlg::BlocksGUI_PropagateDlg(QWidget* parent, const char* name /***************************************************************/ + setHelpFileName("propagate.htm"); + Init(); } - //================================================================================= // function : ~BlocksGUI_PropagateDlg() // purpose : Destroys the object and frees any allocated resources @@ -87,7 +90,6 @@ BlocksGUI_PropagateDlg::~BlocksGUI_PropagateDlg() { } - //================================================================================= // function : Init() // purpose : @@ -102,10 +104,6 @@ void BlocksGUI_PropagateDlg::Init() //myGeomGUI->SetState( 0 ); /* signals and slots connections */ - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -126,8 +124,6 @@ void BlocksGUI_PropagateDlg::ClickOnOk() ClickOnCancel(); } - - //================================================================================= // function : ClickOnApply() // purpose : @@ -148,16 +144,6 @@ bool BlocksGUI_PropagateDlg::ClickOnApply() } -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void BlocksGUI_PropagateDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection @@ -203,17 +189,6 @@ void BlocksGUI_PropagateDlg::LineEditReturnPressed() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void BlocksGUI_PropagateDlg::DeactivateActiveDialog() -{ - //myGeomGUI->SetState( -1 ); - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ActivateThisDialog() // purpose : @@ -316,4 +291,3 @@ GEOM::GEOM_Object_ptr BlocksGUI_PropagateDlg::getFather (GEOM::GEOM_Object_ptr) { return myObject; } - diff --git a/src/BlocksGUI/BlocksGUI_PropagateDlg.h b/src/BlocksGUI/BlocksGUI_PropagateDlg.h index e0efe4271..e6236d632 100644 --- a/src/BlocksGUI/BlocksGUI_PropagateDlg.h +++ b/src/BlocksGUI/BlocksGUI_PropagateDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BlocksGUI_PropagateDlg.h // Author : VKN // Module : GEOM -// $Header$ #ifndef DIALOGBOX_BlocksGUI_PropagateDlg_H #define DIALOGBOX_BlocksGUI_PropagateDlg_H @@ -43,7 +42,8 @@ class GEOM_BLOCKSGUI_EXPORT BlocksGUI_PropagateDlg : public GEOMBase_Skeleton Q_OBJECT public: - BlocksGUI_PropagateDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BlocksGUI_PropagateDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = "", bool modal = FALSE, WFlags fl = 0); ~BlocksGUI_PropagateDlg(); protected: @@ -56,27 +56,23 @@ protected: private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); -private : +private: void Init(); void enterEvent(QEvent* e); void closeEvent(QCloseEvent* e); void activateSelection(); -private : - +private: GEOM::GEOM_Object_var myObject; QPushButton* mySelBtn; QLineEdit* mySelName; - }; #endif // DIALOGBOX_BlocksGUI_PropagateDlg_H diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx index ebf979a2b..0f1b9747f 100644 --- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.cxx @@ -16,7 +16,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -32,23 +32,21 @@ #include "SalomeApp_Application.h" #include "LightApp_SelectionMgr.h" -//using namespace std; - #include //================================================================================= // class : BlocksGUI_QuadFaceDlg() // purpose : Constructs a BlocksGUI_QuadFaceDlg which is a child of 'parent'. //================================================================================= -BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (QWidget* parent, - bool modal) - : GEOMBase_Skeleton(parent, "QuadFaceDlg", modal, +BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal) + : GEOMBase_Skeleton(theGeometryGUI, parent, "QuadFaceDlg", modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_VERT"))); - QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_2_EDGE"))); - QPixmap image3 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_EDGE"))); - QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); + SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr(); + QPixmap image1 (aResMgr->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_VERT"))); + QPixmap image2 (aResMgr->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_2_EDGE"))); + QPixmap image3 (aResMgr->loadPixmap("GEOM",tr("ICON_DLG_QUAD_FACE_4_EDGE"))); + QPixmap imageS (aResMgr->loadPixmap("GEOM",tr("ICON_SELECT"))); setCaption(tr("GEOM_QUAD_FACE_TITLE")); @@ -102,6 +100,8 @@ BlocksGUI_QuadFaceDlg::BlocksGUI_QuadFaceDlg (QWidget* parent, Layout1->addWidget(myGrp3, 2, 0); /***************************************************************/ + setHelpFileName("newentity_blocks.htm#QuadrangleFace"); + Init(); } diff --git a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h index 42a8c3944..be706bab3 100644 --- a/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h +++ b/src/BlocksGUI/BlocksGUI_QuadFaceDlg.h @@ -16,14 +16,13 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BlocksGUI_QuadFaceDlg.h // Author : Julia DOROVSKIKH // Module : GEOM -// $Header$ #ifndef DIALOGBOX_QUAD_FACE_H #define DIALOGBOX_QUAD_FACE_H @@ -45,15 +44,14 @@ class GEOM_BLOCKSGUI_EXPORT BlocksGUI_QuadFaceDlg : public GEOMBase_Skeleton Edge14, Edge24, Edge34, Edge44 }; public: - BlocksGUI_QuadFaceDlg (QWidget* parent, - bool modal = FALSE); + BlocksGUI_QuadFaceDlg (GeometryGUI*, QWidget* parent, bool modal = FALSE); ~BlocksGUI_QuadFaceDlg(); protected: // redefined from GEOMBase_Helper virtual GEOM::GEOM_IOperations_ptr createOperation(); - virtual bool isValid (QString& msg); - virtual bool execute (ObjectList& objects); + virtual bool isValid (QString& msg); + virtual bool execute (ObjectList& objects); private: void Init(); @@ -81,7 +79,6 @@ private slots: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); -// void DeactivateActiveDialog(); void ConstructorsClicked( int constructorId ); void SelectionIntoArgument(); diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx index b58b8c62d..bfc6d9d66 100644 --- a/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx +++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.cxx @@ -16,7 +16,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -42,14 +42,14 @@ // class : BlocksGUI_TrsfDlg() // purpose : Constructs a BlocksGUI_TrsfDlg which is a child of 'parent'. //================================================================================= -BlocksGUI_TrsfDlg::BlocksGUI_TrsfDlg (QWidget* parent, - bool modal) - : GEOMBase_Skeleton(parent, "TrsfDlg", modal, +BlocksGUI_TrsfDlg::BlocksGUI_TrsfDlg (GeometryGUI* theGeometryGUI, QWidget* parent, bool modal) + : GEOMBase_Skeleton(theGeometryGUI, parent, "TrsfDlg", modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_MULTITRSF_SIMPLE"))); - QPixmap image2 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BLOCK_MULTITRSF_DOUBLE"))); - QPixmap imageS (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); + SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr(); + QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_MULTITRSF_SIMPLE"))); + QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_BLOCK_MULTITRSF_DOUBLE"))); + QPixmap imageS (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT"))); setCaption(tr("GEOM_BLOCK_MULTITRSF_TITLE")); @@ -119,6 +119,8 @@ BlocksGUI_TrsfDlg::BlocksGUI_TrsfDlg (QWidget* parent, Layout1->addWidget( myGrp2, 2, 0 ); /***************************************************************/ + setHelpFileName("multi_transformation.htm"); + Init(); } @@ -347,16 +349,6 @@ void BlocksGUI_TrsfDlg::enterEvent (QEvent* e) this->ActivateThisDialog(); } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -//void BlocksGUI_TrsfDlg::DeactivateActiveDialog() -//{ -// // disconnect selection -// GEOMBase_Skeleton::DeactivateActiveDialog(); -//} - //================================================================================= // function : ValueChangedInSpinBox() // purpose : diff --git a/src/BlocksGUI/BlocksGUI_TrsfDlg.h b/src/BlocksGUI/BlocksGUI_TrsfDlg.h index 92688039b..fdc053637 100644 --- a/src/BlocksGUI/BlocksGUI_TrsfDlg.h +++ b/src/BlocksGUI/BlocksGUI_TrsfDlg.h @@ -16,14 +16,13 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BlocksGUI_TrsfDlg.h // Author : Julia DOROVSKIKH // Module : GEOM -// $Header$ #ifndef DIALOGBOX_BLOCK_MULTITRSF_H #define DIALOGBOX_BLOCK_MULTITRSF_H @@ -48,8 +47,7 @@ class GEOM_BLOCKSGUI_EXPORT BlocksGUI_TrsfDlg : public GEOMBase_Skeleton enum { SpinBox1, SpinBox2U, SpinBox2V }; public: - BlocksGUI_TrsfDlg (QWidget* parent, - bool modal = FALSE); + BlocksGUI_TrsfDlg (GeometryGUI*, QWidget* parent, bool modal = FALSE); ~BlocksGUI_TrsfDlg(); protected: @@ -83,7 +81,6 @@ private slots: void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); -// void DeactivateActiveDialog(); void ConstructorsClicked (int constructorId); void SelectionIntoArgument(); diff --git a/src/BlocksGUI/Makefile.in b/src/BlocksGUI/Makefile.in index d7f2af03f..26c445679 100644 --- a/src/BlocksGUI/Makefile.in +++ b/src/BlocksGUI/Makefile.in @@ -16,7 +16,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -61,8 +61,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase diff --git a/src/BooleanGUI/BooleanGUI.cxx b/src/BooleanGUI/BooleanGUI.cxx index f48642f51..17702fe43 100644 --- a/src/BooleanGUI/BooleanGUI.cxx +++ b/src/BooleanGUI/BooleanGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -89,7 +89,7 @@ bool BooleanGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) else return false; - QDialog* aDlg = new BooleanGUI_Dialog( anOperation, parent, ""); + QDialog* aDlg = new BooleanGUI_Dialog( anOperation, getGeometryGUI(), parent, ""); aDlg->show(); return true; diff --git a/src/BooleanGUI/BooleanGUI.h b/src/BooleanGUI/BooleanGUI.h index 7e7e238f6..9592d6c44 100644 --- a/src/BooleanGUI/BooleanGUI.h +++ b/src/BooleanGUI/BooleanGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/BooleanGUI/BooleanGUI_Dialog.cxx b/src/BooleanGUI/BooleanGUI_Dialog.cxx index c1e4e6d5d..b777cddd4 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.cxx +++ b/src/BooleanGUI/BooleanGUI_Dialog.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -45,8 +45,9 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BooleanGUI_Dialog::BooleanGUI_Dialog( const int theOperation, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, fl), +BooleanGUI_Dialog::BooleanGUI_Dialog( const int theOperation, GeometryGUI* theGeometryGUI, + QWidget* parent, const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl), myOperation( theOperation ) { QPixmap image0; @@ -57,21 +58,25 @@ BooleanGUI_Dialog::BooleanGUI_Dialog( const int theOperation, QWidget* parent, c image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_COMMON"))); aTitle = tr("GEOM_COMMON"); aCaption = tr("GEOM_COMMON_TITLE"); + setHelpFileName("common.htm"); break; case BooleanGUI::CUT: image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CUT"))); aTitle = tr("GEOM_CUT"); aCaption = tr("GEOM_CUT_TITLE"); + setHelpFileName("cut.htm"); break; case BooleanGUI::FUSE: image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_FUSE"))); aTitle = tr("GEOM_FUSE"); aCaption = tr("GEOM_FUSE_TITLE"); + setHelpFileName("fuse.htm"); break; case BooleanGUI::SECTION: image0 = QPixmap( SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SECTION"))); aTitle = tr("GEOM_SECTION"); aCaption = tr("GEOM_SECTION_TITLE"); + setHelpFileName("section.htm"); break; } QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -119,7 +124,6 @@ BooleanGUI_Dialog::~BooleanGUI_Dialog() } - //================================================================================= // function : Init() // purpose : @@ -216,7 +220,6 @@ void BooleanGUI_Dialog::SetEditCurrentArgument() } - //================================================================================= // function : LineEditReturnPressed() // purpose : diff --git a/src/BooleanGUI/BooleanGUI_Dialog.h b/src/BooleanGUI/BooleanGUI_Dialog.h index b6e357623..e42fd2be2 100644 --- a/src/BooleanGUI/BooleanGUI_Dialog.h +++ b/src/BooleanGUI/BooleanGUI_Dialog.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BooleanGUI_Dialog.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef BooleanGUI_Dialog_H #define BooleanGUI_Dialog_H @@ -44,7 +43,8 @@ class GEOM_BOOLEANGUI_EXPORT BooleanGUI_Dialog : public GEOMBase_Skeleton Q_OBJECT public: - BooleanGUI_Dialog( const int theOperation, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BooleanGUI_Dialog( const int theOperation, GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BooleanGUI_Dialog(); protected: @@ -71,7 +71,6 @@ private slots: void SelectionIntoArgument(); void LineEditReturnPressed(); void ActivateThisDialog(); - }; #endif // BooleanGUI_Dialog_H diff --git a/src/BooleanGUI/Makefile.in b/src/BooleanGUI/Makefile.in index f90b5d458..45846c838 100644 --- a/src/BooleanGUI/Makefile.in +++ b/src/BooleanGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -52,8 +52,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMBase diff --git a/src/BuildGUI/BuildGUI.cxx b/src/BuildGUI/BuildGUI.cxx index ea176cdc7..21f5f9188 100644 --- a/src/BuildGUI/BuildGUI.cxx +++ b/src/BuildGUI/BuildGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -85,12 +85,12 @@ bool BuildGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) switch ( theCommandID ) { - case 4081: aDlg = new BuildGUI_EdgeDlg ( parent, "" ); break; - case 4082: aDlg = new BuildGUI_WireDlg ( parent, "" ); break; - case 4083: aDlg = new BuildGUI_FaceDlg ( parent, "" ); break; - case 4084: aDlg = new BuildGUI_ShellDlg ( parent, "" ); break; - case 4085: aDlg = new BuildGUI_SolidDlg ( parent, "" ); break; - case 4086: aDlg = new BuildGUI_CompoundDlg( parent, "" ); break; + case 4081: aDlg = new BuildGUI_EdgeDlg ( getGeometryGUI(), parent, "" ); break; + case 4082: aDlg = new BuildGUI_WireDlg ( getGeometryGUI(), parent, "" ); break; + case 4083: aDlg = new BuildGUI_FaceDlg ( getGeometryGUI(), parent, "" ); break; + case 4084: aDlg = new BuildGUI_ShellDlg ( getGeometryGUI(), parent, "" ); break; + case 4085: aDlg = new BuildGUI_SolidDlg ( getGeometryGUI(), parent, "" ); break; + case 4086: aDlg = new BuildGUI_CompoundDlg( getGeometryGUI(), parent, "" ); break; default: SUIT_Session::session()->activeApplication()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); diff --git a/src/BuildGUI/BuildGUI.h b/src/BuildGUI/BuildGUI.h index ae230ce16..6de75a9dd 100644 --- a/src/BuildGUI/BuildGUI.h +++ b/src/BuildGUI/BuildGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.cxx b/src/BuildGUI/BuildGUI_CompoundDlg.cxx index d993cbbe0..e8dfbb88a 100644 --- a/src/BuildGUI/BuildGUI_CompoundDlg.cxx +++ b/src/BuildGUI/BuildGUI_CompoundDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -42,8 +42,10 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_COMPOUND"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -65,6 +67,8 @@ BuildGUI_CompoundDlg::BuildGUI_CompoundDlg(QWidget* parent, const char* name, bo Layout1->addWidget(GroupShapes, 2, 0); /***************************************************************/ + setHelpFileName("compound.htm"); + /* Initialisations */ Init(); } diff --git a/src/BuildGUI/BuildGUI_CompoundDlg.h b/src/BuildGUI/BuildGUI_CompoundDlg.h index b667addb8..31182622c 100644 --- a/src/BuildGUI/BuildGUI_CompoundDlg.h +++ b/src/BuildGUI/BuildGUI_CompoundDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : GEOMBase_CompoundDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_COMPOUND_H #define DIALOGBOX_COMPOUND_H @@ -43,7 +42,8 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_CompoundDlg : public GEOMBase_Skeleton Q_OBJECT public: - BuildGUI_CompoundDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BuildGUI_CompoundDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BuildGUI_CompoundDlg(); protected: @@ -67,7 +67,6 @@ private slots: void ActivateThisDialog(); void SelectionIntoArgument(); void SetEditCurrentArgument(); - }; #endif // DIALOGBOX_COMPOUND_H diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.cxx b/src/BuildGUI/BuildGUI_EdgeDlg.cxx index e43e9e6f9..873efc3a6 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.cxx +++ b/src/BuildGUI/BuildGUI_EdgeDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -47,8 +47,10 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BuildGUI_EdgeDlg::BuildGUI_EdgeDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +BuildGUI_EdgeDlg::BuildGUI_EdgeDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_EDGE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -74,6 +76,8 @@ BuildGUI_EdgeDlg::BuildGUI_EdgeDlg(QWidget* parent, const char* name, bool modal Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("edge.htm"); + /* Initialisations */ Init(); } diff --git a/src/BuildGUI/BuildGUI_EdgeDlg.h b/src/BuildGUI/BuildGUI_EdgeDlg.h index f18a6a5c2..3a7b7b2b5 100644 --- a/src/BuildGUI/BuildGUI_EdgeDlg.h +++ b/src/BuildGUI/BuildGUI_EdgeDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BuildGUI_EdgeDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_EDGE_H #define DIALOGBOX_EDGE_H @@ -43,7 +42,8 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_EdgeDlg : public GEOMBase_Skeleton Q_OBJECT public: - BuildGUI_EdgeDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BuildGUI_EdgeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BuildGUI_EdgeDlg(); protected: @@ -52,7 +52,7 @@ protected: virtual bool isValid( QString& msg ); virtual bool execute( ObjectList& objects ); -private : +private: void Init(); void enterEvent(QEvent* e); @@ -69,7 +69,6 @@ private slots: void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); - }; #endif // DIALOGBOX_EDGE_H diff --git a/src/BuildGUI/BuildGUI_FaceDlg.cxx b/src/BuildGUI/BuildGUI_FaceDlg.cxx index f9a5891f2..36d8605a9 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.cxx +++ b/src/BuildGUI/BuildGUI_FaceDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -46,8 +46,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BuildGUI_FaceDlg::BuildGUI_FaceDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +BuildGUI_FaceDlg::BuildGUI_FaceDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_FACE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -69,6 +71,8 @@ BuildGUI_FaceDlg::BuildGUI_FaceDlg(QWidget* parent, const char* name, bool modal Layout1->addWidget(GroupWire, 2, 0); /***************************************************************/ + setHelpFileName("face.htm"); + /* Initialisations */ Init(); } diff --git a/src/BuildGUI/BuildGUI_FaceDlg.h b/src/BuildGUI/BuildGUI_FaceDlg.h index 35a7d5646..734cbc2f3 100644 --- a/src/BuildGUI/BuildGUI_FaceDlg.h +++ b/src/BuildGUI/BuildGUI_FaceDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BuildGUI_FaceDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_FACE_H #define DIALOGBOX_FACE_H @@ -43,7 +42,8 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_FaceDlg : public GEOMBase_Skeleton Q_OBJECT public: - BuildGUI_FaceDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BuildGUI_FaceDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BuildGUI_FaceDlg(); protected: @@ -66,7 +66,6 @@ private slots: void ActivateThisDialog(); void SelectionIntoArgument(); void SetEditCurrentArgument(); - }; #endif // DIALOGBOX_FACE_H diff --git a/src/BuildGUI/BuildGUI_ShellDlg.cxx b/src/BuildGUI/BuildGUI_ShellDlg.cxx index 54fd59132..3054237bd 100644 --- a/src/BuildGUI/BuildGUI_ShellDlg.cxx +++ b/src/BuildGUI/BuildGUI_ShellDlg.cxx @@ -17,14 +17,14 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BuildGUI_ShellDlg.cxx // Author : Damien COQUERET // Module : GEOM -// $Header: +// $Header$ #include "BuildGUI_ShellDlg.h" #include "GEOMImpl_Types.hxx" @@ -44,8 +44,10 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BuildGUI_ShellDlg::BuildGUI_ShellDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +BuildGUI_ShellDlg::BuildGUI_ShellDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SHELL"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); @@ -67,6 +69,8 @@ BuildGUI_ShellDlg::BuildGUI_ShellDlg(QWidget* parent, const char* name, bool mod Layout1->addWidget(GroupShell, 2, 0); /***************************************************************/ + setHelpFileName("shell.htm"); + /* Initialisations */ Init(); } diff --git a/src/BuildGUI/BuildGUI_ShellDlg.h b/src/BuildGUI/BuildGUI_ShellDlg.h index 9fbc89603..8c1132468 100644 --- a/src/BuildGUI/BuildGUI_ShellDlg.h +++ b/src/BuildGUI/BuildGUI_ShellDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BuildGUI_ShellDlg.h // Author : Damien COQUERET // Module : GEOM -// $Header: #ifndef DIALOGBOX_SHELL_H #define DIALOGBOX_SHELL_H @@ -43,7 +42,8 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_ShellDlg : public GEOMBase_Skeleton Q_OBJECT public: - BuildGUI_ShellDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BuildGUI_ShellDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BuildGUI_ShellDlg(); protected: @@ -67,7 +67,6 @@ private slots: void SetEditCurrentArgument(); void SelectionIntoArgument(); void ActivateThisDialog(); - }; #endif // DIALOGBOX_SHELL_H diff --git a/src/BuildGUI/BuildGUI_SolidDlg.cxx b/src/BuildGUI/BuildGUI_SolidDlg.cxx index 9dbdec0db..84009bfc2 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.cxx +++ b/src/BuildGUI/BuildGUI_SolidDlg.cxx @@ -17,14 +17,14 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BuildGUI_SolidDlg.cxx // Author : Damien COQUERET // Module : GEOM -// $Header: +// $Header$ #include "BuildGUI_SolidDlg.h" #include "GEOMImpl_Types.hxx" @@ -44,8 +44,10 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BuildGUI_SolidDlg::BuildGUI_SolidDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +BuildGUI_SolidDlg::BuildGUI_SolidDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BUILD_SOLID"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); @@ -68,6 +70,8 @@ BuildGUI_SolidDlg::BuildGUI_SolidDlg(QWidget* parent, const char* name, bool mod Layout1->addWidget(GroupSolid, 2, 0); /***************************************************************/ + setHelpFileName("solid.htm"); + /* Initialisations */ Init(); } diff --git a/src/BuildGUI/BuildGUI_SolidDlg.h b/src/BuildGUI/BuildGUI_SolidDlg.h index 1d3802bfb..41982f4a2 100644 --- a/src/BuildGUI/BuildGUI_SolidDlg.h +++ b/src/BuildGUI/BuildGUI_SolidDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BuildGUI_SolidDlg.h // Author : Damien COQUERET // Module : GEOM -// $Header: #ifndef DIALOGBOX_SOLID_H #define DIALOGBOX_SOLID_H @@ -43,7 +42,8 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_SolidDlg : public GEOMBase_Skeleton Q_OBJECT public: - BuildGUI_SolidDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BuildGUI_SolidDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BuildGUI_SolidDlg(); protected: @@ -69,7 +69,6 @@ private slots: void SelectionIntoArgument(); void ActivateThisDialog(); void EnableNameField(bool toEnable); - }; #endif // DIALOGBOX_SOLID_H diff --git a/src/BuildGUI/BuildGUI_WireDlg.cxx b/src/BuildGUI/BuildGUI_WireDlg.cxx index 9775a5cb1..4c9da598a 100644 --- a/src/BuildGUI/BuildGUI_WireDlg.cxx +++ b/src/BuildGUI/BuildGUI_WireDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -44,8 +44,10 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -BuildGUI_WireDlg::BuildGUI_WireDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +BuildGUI_WireDlg::BuildGUI_WireDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_BUILD_WIRE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -67,6 +69,8 @@ BuildGUI_WireDlg::BuildGUI_WireDlg(QWidget* parent, const char* name, bool modal Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("wire.htm"); + /* Initialisations */ Init(); } diff --git a/src/BuildGUI/BuildGUI_WireDlg.h b/src/BuildGUI/BuildGUI_WireDlg.h index 15df1e2e6..ecfcc2c14 100644 --- a/src/BuildGUI/BuildGUI_WireDlg.h +++ b/src/BuildGUI/BuildGUI_WireDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : BuildGUI_WireDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_WIRE_H #define DIALOGBOX_WIRE_H @@ -43,7 +42,8 @@ class GEOM_BUILDGUI_EXPORT BuildGUI_WireDlg : public GEOMBase_Skeleton Q_OBJECT public: - BuildGUI_WireDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + BuildGUI_WireDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~BuildGUI_WireDlg(); protected: @@ -67,7 +67,6 @@ private slots: void ActivateThisDialog(); void SelectionIntoArgument(); void SetEditCurrentArgument(); - }; #endif // DIALOGBOX_WIRE_H diff --git a/src/BuildGUI/Makefile.in b/src/BuildGUI/Makefile.in index db8700ff8..9ba43d0ec 100644 --- a/src/BuildGUI/Makefile.in +++ b/src/BuildGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -63,8 +63,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase diff --git a/src/DisplayGUI/DisplayGUI.cxx b/src/DisplayGUI/DisplayGUI.cxx index 13d6577d1..1f26121e5 100644 --- a/src/DisplayGUI/DisplayGUI.cxx +++ b/src/DisplayGUI/DisplayGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DisplayGUI/DisplayGUI.h b/src/DisplayGUI/DisplayGUI.h index 74d409610..bf69a3286 100644 --- a/src/DisplayGUI/DisplayGUI.h +++ b/src/DisplayGUI/DisplayGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DisplayGUI/Makefile.in b/src/DisplayGUI/Makefile.in index 59d22518b..8df00b985 100644 --- a/src/DisplayGUI/Makefile.in +++ b/src/DisplayGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -50,8 +50,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOM diff --git a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.cxx b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.cxx index be2fc4683..0159516ca 100644 --- a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.cxx +++ b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1List1Spin1Btn_QTD.ui' diff --git a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h index bbb25661c..a14fe62a5 100644 --- a/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h +++ b/src/DlgRef/DlgRef_1List1Spin1Btn_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1List1Spin1Btn_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.cxx b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.cxx index a23049fb2..05e896b28 100644 --- a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel1Check1List_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h index 60095acc3..834d71a32 100644 --- a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h +++ b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel1Check1List_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel1Check_QTD.cxx b/src/DlgRef/DlgRef_1Sel1Check_QTD.cxx index eb0f2cdb3..7c86f65c7 100644 --- a/src/DlgRef/DlgRef_1Sel1Check_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel1Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel1Check_QTD.h b/src/DlgRef/DlgRef_1Sel1Check_QTD.h index 3c67a3a4e..ace1e2606 100644 --- a/src/DlgRef/DlgRef_1Sel1Check_QTD.h +++ b/src/DlgRef/DlgRef_1Sel1Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel1Spin.cxx b/src/DlgRef/DlgRef_1Sel1Spin.cxx index 86be0f2dd..1788e1892 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin.cxx +++ b/src/DlgRef/DlgRef_1Sel1Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel1Spin.h b/src/DlgRef/DlgRef_1Sel1Spin.h index d599d56c2..3202db597 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin.h +++ b/src/DlgRef/DlgRef_1Sel1Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check.cxx b/src/DlgRef/DlgRef_1Sel1Spin1Check.cxx index 89196c2fc..cfca35fa2 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin1Check.cxx +++ b/src/DlgRef/DlgRef_1Sel1Spin1Check.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check.h b/src/DlgRef/DlgRef_1Sel1Spin1Check.h index 993a3e934..0e30376eb 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin1Check.h +++ b/src/DlgRef/DlgRef_1Sel1Spin1Check.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.cxx index a92fc99e5..57014bf69 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel1Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h index 8cbc6c1a7..1dd195db4 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_1Sel1Spin1Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel1Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel1Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel1Spin_QTD.cxx index 7eae9fbec..716703312 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel1Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel1Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel1Spin_QTD.h b/src/DlgRef/DlgRef_1Sel1Spin_QTD.h index 778c0b851..f00c396ef 100644 --- a/src/DlgRef/DlgRef_1Sel1Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel1Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel1Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel2Spin.cxx b/src/DlgRef/DlgRef_1Sel2Spin.cxx index f8471b369..17b68a9a5 100644 --- a/src/DlgRef/DlgRef_1Sel2Spin.cxx +++ b/src/DlgRef/DlgRef_1Sel2Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel2Spin.h b/src/DlgRef/DlgRef_1Sel2Spin.h index ee6f9d0c8..c7e8054c1 100644 --- a/src/DlgRef/DlgRef_1Sel2Spin.h +++ b/src/DlgRef/DlgRef_1Sel2Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel2Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel2Spin_QTD.cxx index 38d5551f5..ea98f7166 100644 --- a/src/DlgRef/DlgRef_1Sel2Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel2Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel2Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel2Spin_QTD.h b/src/DlgRef/DlgRef_1Sel2Spin_QTD.h index a952e67c1..b85a76a37 100644 --- a/src/DlgRef/DlgRef_1Sel2Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel2Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel2Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel3Check_QTD.cxx b/src/DlgRef/DlgRef_1Sel3Check_QTD.cxx index 854abd297..db0cb79ec 100644 --- a/src/DlgRef/DlgRef_1Sel3Check_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel3Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel3Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel3Check_QTD.h b/src/DlgRef/DlgRef_1Sel3Check_QTD.h index 0301e2661..83e38df33 100644 --- a/src/DlgRef/DlgRef_1Sel3Check_QTD.h +++ b/src/DlgRef/DlgRef_1Sel3Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel3Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel3Spin.cxx b/src/DlgRef/DlgRef_1Sel3Spin.cxx index 8cf310421..a356d2f1f 100644 --- a/src/DlgRef/DlgRef_1Sel3Spin.cxx +++ b/src/DlgRef/DlgRef_1Sel3Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel3Spin.h b/src/DlgRef/DlgRef_1Sel3Spin.h index 003acde75..f307a283b 100644 --- a/src/DlgRef/DlgRef_1Sel3Spin.h +++ b/src/DlgRef/DlgRef_1Sel3Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel3Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel3Spin_QTD.cxx index d08f76765..e0356a604 100644 --- a/src/DlgRef/DlgRef_1Sel3Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel3Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel3Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel3Spin_QTD.h b/src/DlgRef/DlgRef_1Sel3Spin_QTD.h index 8314a9e78..61b0d21f0 100644 --- a/src/DlgRef/DlgRef_1Sel3Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel3Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel3Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel4Spin.cxx b/src/DlgRef/DlgRef_1Sel4Spin.cxx index 107e5a426..66af2fea2 100644 --- a/src/DlgRef/DlgRef_1Sel4Spin.cxx +++ b/src/DlgRef/DlgRef_1Sel4Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel4Spin.h b/src/DlgRef/DlgRef_1Sel4Spin.h index a39c4cb04..4dcfeb3c6 100644 --- a/src/DlgRef/DlgRef_1Sel4Spin.h +++ b/src/DlgRef/DlgRef_1Sel4Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel4Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel4Spin_QTD.cxx index 735bc811e..f245c6292 100644 --- a/src/DlgRef/DlgRef_1Sel4Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel4Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel4Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel4Spin_QTD.h b/src/DlgRef/DlgRef_1Sel4Spin_QTD.h index ce50174d6..a865d411b 100644 --- a/src/DlgRef/DlgRef_1Sel4Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel4Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel4Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel5Spin.cxx b/src/DlgRef/DlgRef_1Sel5Spin.cxx index bc150405c..1820c25e2 100644 --- a/src/DlgRef/DlgRef_1Sel5Spin.cxx +++ b/src/DlgRef/DlgRef_1Sel5Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel5Spin.h b/src/DlgRef/DlgRef_1Sel5Spin.h index 968f67053..e1bbefbeb 100644 --- a/src/DlgRef/DlgRef_1Sel5Spin.h +++ b/src/DlgRef/DlgRef_1Sel5Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Sel5Spin_QTD.cxx b/src/DlgRef/DlgRef_1Sel5Spin_QTD.cxx index a37665f71..3fd23ef11 100644 --- a/src/DlgRef/DlgRef_1Sel5Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel5Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel5Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel5Spin_QTD.h b/src/DlgRef/DlgRef_1Sel5Spin_QTD.h index 5e93d42e2..d5375b19c 100644 --- a/src/DlgRef/DlgRef_1Sel5Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Sel5Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel5Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel_Ext.h b/src/DlgRef/DlgRef_1Sel_Ext.h index 81e9d40de..ff29a6216 100644 --- a/src/DlgRef/DlgRef_1Sel_Ext.h +++ b/src/DlgRef/DlgRef_1Sel_Ext.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel_QTD.cxx b/src/DlgRef/DlgRef_1Sel_QTD.cxx index 730efcc15..0c2220e53 100644 --- a/src/DlgRef/DlgRef_1Sel_QTD.cxx +++ b/src/DlgRef/DlgRef_1Sel_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Sel_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Sel_QTD.h b/src/DlgRef/DlgRef_1Sel_QTD.h index 9ce410dca..4fce28453 100644 --- a/src/DlgRef/DlgRef_1Sel_QTD.h +++ b/src/DlgRef/DlgRef_1Sel_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Sel_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Spin.cxx b/src/DlgRef/DlgRef_1Spin.cxx index 20778cd4b..00244bc79 100644 --- a/src/DlgRef/DlgRef_1Spin.cxx +++ b/src/DlgRef/DlgRef_1Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Spin.h b/src/DlgRef/DlgRef_1Spin.h index efcc0847b..8acaa2680 100644 --- a/src/DlgRef/DlgRef_1Spin.h +++ b/src/DlgRef/DlgRef_1Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_1Spin_QTD.cxx b/src/DlgRef/DlgRef_1Spin_QTD.cxx index e01489a12..a028f91d9 100644 --- a/src/DlgRef/DlgRef_1Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_1Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_1Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_1Spin_QTD.h b/src/DlgRef/DlgRef_1Spin_QTD.h index 4966216b1..25177e9e5 100644 --- a/src/DlgRef/DlgRef_1Spin_QTD.h +++ b/src/DlgRef/DlgRef_1Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_1Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel1Spin.cxx b/src/DlgRef/DlgRef_2Sel1Spin.cxx index b42b334cf..141e744fd 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin.cxx +++ b/src/DlgRef/DlgRef_2Sel1Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel1Spin.h b/src/DlgRef/DlgRef_2Sel1Spin.h index f6dd01c42..8e401687f 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin.h +++ b/src/DlgRef/DlgRef_2Sel1Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check.cxx b/src/DlgRef/DlgRef_2Sel1Spin2Check.cxx index 717897572..0184c15e4 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin2Check.cxx +++ b/src/DlgRef/DlgRef_2Sel1Spin2Check.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check.h b/src/DlgRef/DlgRef_2Sel1Spin2Check.h index b899ff975..227dcee67 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin2Check.h +++ b/src/DlgRef/DlgRef_2Sel1Spin2Check.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.cxx b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.cxx index f67e3e07f..35fd8b355 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.cxx +++ b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_2Sel1Spin2Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h index 9d4a40820..617fd445a 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h +++ b/src/DlgRef/DlgRef_2Sel1Spin2Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_2Sel1Spin2Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel1Spin_QTD.cxx b/src/DlgRef/DlgRef_2Sel1Spin_QTD.cxx index 5e03c2747..0e649c958 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_2Sel1Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_2Sel1Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel1Spin_QTD.h b/src/DlgRef/DlgRef_2Sel1Spin_QTD.h index 04a83b211..d35c3606e 100644 --- a/src/DlgRef/DlgRef_2Sel1Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Sel1Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_2Sel1Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel2Spin.cxx b/src/DlgRef/DlgRef_2Sel2Spin.cxx index 660206876..58341f3bf 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin.cxx +++ b/src/DlgRef/DlgRef_2Sel2Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel2Spin.h b/src/DlgRef/DlgRef_2Sel2Spin.h index a5aa9002b..ed09840e0 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin.h +++ b/src/DlgRef/DlgRef_2Sel2Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check.cxx b/src/DlgRef/DlgRef_2Sel2Spin1Check.cxx index f8ac135da..e352f7d34 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin1Check.cxx +++ b/src/DlgRef/DlgRef_2Sel2Spin1Check.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check.h b/src/DlgRef/DlgRef_2Sel2Spin1Check.h index eeff1453d..b15de5665 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin1Check.h +++ b/src/DlgRef/DlgRef_2Sel2Spin1Check.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.cxx index 3091cdf4b..b2d22bfda 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.cxx +++ b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_2Sel2Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h index 63fdf388c..c3d703005 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_2Sel2Spin1Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_2Sel2Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel2Spin_QTD.cxx b/src/DlgRef/DlgRef_2Sel2Spin_QTD.cxx index 2e18f0411..faf1f66b1 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_2Sel2Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_2Sel2Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel2Spin_QTD.h b/src/DlgRef/DlgRef_2Sel2Spin_QTD.h index 1b65d1c9e..bc5157559 100644 --- a/src/DlgRef/DlgRef_2Sel2Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Sel2Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_2Sel2Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel3Spin.cxx b/src/DlgRef/DlgRef_2Sel3Spin.cxx index a0a9999f8..8006c508f 100644 --- a/src/DlgRef/DlgRef_2Sel3Spin.cxx +++ b/src/DlgRef/DlgRef_2Sel3Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel3Spin.h b/src/DlgRef/DlgRef_2Sel3Spin.h index dd809e13a..53b857b66 100644 --- a/src/DlgRef/DlgRef_2Sel3Spin.h +++ b/src/DlgRef/DlgRef_2Sel3Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel3Spin_QTD.cxx b/src/DlgRef/DlgRef_2Sel3Spin_QTD.cxx index a931f602b..a47905184 100644 --- a/src/DlgRef/DlgRef_2Sel3Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_2Sel3Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_2Sel3Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel3Spin_QTD.h b/src/DlgRef/DlgRef_2Sel3Spin_QTD.h index 274b97df2..8b49e9f50 100644 --- a/src/DlgRef/DlgRef_2Sel3Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Sel3Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_2Sel3Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check.cxx b/src/DlgRef/DlgRef_2Sel4Spin1Check.cxx index 2a039dd2b..bfb387e53 100644 --- a/src/DlgRef/DlgRef_2Sel4Spin1Check.cxx +++ b/src/DlgRef/DlgRef_2Sel4Spin1Check.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check.h b/src/DlgRef/DlgRef_2Sel4Spin1Check.h index 348cbaa44..1d5e0c4ab 100644 --- a/src/DlgRef/DlgRef_2Sel4Spin1Check.h +++ b/src/DlgRef/DlgRef_2Sel4Spin1Check.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.cxx index 8449ee1bd..3dd3f2e38 100644 --- a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.cxx +++ b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_2Sel4Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h index 2eaded516..7f49d2b09 100644 --- a/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_2Sel4Spin1Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_2Sel4Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel_QTD.cxx b/src/DlgRef/DlgRef_2Sel_QTD.cxx index 62f352171..7e305f6ef 100644 --- a/src/DlgRef/DlgRef_2Sel_QTD.cxx +++ b/src/DlgRef/DlgRef_2Sel_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_2Sel_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Sel_QTD.h b/src/DlgRef/DlgRef_2Sel_QTD.h index 9584b2ade..c28d7e908 100644 --- a/src/DlgRef/DlgRef_2Sel_QTD.h +++ b/src/DlgRef/DlgRef_2Sel_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_2Sel_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Spin.cxx b/src/DlgRef/DlgRef_2Spin.cxx index f66c33baa..437ed0b28 100644 --- a/src/DlgRef/DlgRef_2Spin.cxx +++ b/src/DlgRef/DlgRef_2Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Spin.h b/src/DlgRef/DlgRef_2Spin.h index 050715ae9..a69052c94 100644 --- a/src/DlgRef/DlgRef_2Spin.h +++ b/src/DlgRef/DlgRef_2Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_2Spin_QTD.cxx b/src/DlgRef/DlgRef_2Spin_QTD.cxx index 31f468010..fab9c4f8c 100644 --- a/src/DlgRef/DlgRef_2Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_2Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_2Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_2Spin_QTD.h b/src/DlgRef/DlgRef_2Spin_QTD.h index 790f85688..b820d4b55 100644 --- a/src/DlgRef/DlgRef_2Spin_QTD.h +++ b/src/DlgRef/DlgRef_2Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_2Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Check_QTD.cxx b/src/DlgRef/DlgRef_3Check_QTD.cxx index 30dc8c1e5..9640159b6 100644 --- a/src/DlgRef/DlgRef_3Check_QTD.cxx +++ b/src/DlgRef/DlgRef_3Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_3Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Check_QTD.h b/src/DlgRef/DlgRef_3Check_QTD.h index 60eaa5b00..976bf8904 100644 --- a/src/DlgRef/DlgRef_3Check_QTD.h +++ b/src/DlgRef/DlgRef_3Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_3Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Sel1Spin.cxx b/src/DlgRef/DlgRef_3Sel1Spin.cxx index 76de7351e..d9e7176cf 100644 --- a/src/DlgRef/DlgRef_3Sel1Spin.cxx +++ b/src/DlgRef/DlgRef_3Sel1Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Sel1Spin.h b/src/DlgRef/DlgRef_3Sel1Spin.h index e15001c0f..60a779899 100644 --- a/src/DlgRef/DlgRef_3Sel1Spin.h +++ b/src/DlgRef/DlgRef_3Sel1Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check.cxx b/src/DlgRef/DlgRef_3Sel3Spin1Check.cxx index e8b60c9b9..dd1a8b249 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin1Check.cxx +++ b/src/DlgRef/DlgRef_3Sel3Spin1Check.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check.h b/src/DlgRef/DlgRef_3Sel3Spin1Check.h index 9f0d8d18d..d1731cfd0 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin1Check.h +++ b/src/DlgRef/DlgRef_3Sel3Spin1Check.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.cxx index 45d83b358..9c9ca5145 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.cxx +++ b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_3Sel3Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h index 253191887..a4c0c63b6 100644 --- a/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_3Sel3Spin1Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_3Sel3Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check.cxx b/src/DlgRef/DlgRef_3Sel4Spin2Check.cxx index b290b918a..d8faeac59 100644 --- a/src/DlgRef/DlgRef_3Sel4Spin2Check.cxx +++ b/src/DlgRef/DlgRef_3Sel4Spin2Check.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check.h b/src/DlgRef/DlgRef_3Sel4Spin2Check.h index 06e055a1a..696c6461b 100644 --- a/src/DlgRef/DlgRef_3Sel4Spin2Check.h +++ b/src/DlgRef/DlgRef_3Sel4Spin2Check.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.cxx b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.cxx index e32b155cb..c0f469b30 100644 --- a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.cxx +++ b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_3Sel4Spin2Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h index d96e2ce85..9503dec91 100644 --- a/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h +++ b/src/DlgRef/DlgRef_3Sel4Spin2Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_3Sel4Spin2Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Sel_QTD.cxx b/src/DlgRef/DlgRef_3Sel_QTD.cxx index 9381494f3..66a038632 100644 --- a/src/DlgRef/DlgRef_3Sel_QTD.cxx +++ b/src/DlgRef/DlgRef_3Sel_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_3Sel_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Sel_QTD.h b/src/DlgRef/DlgRef_3Sel_QTD.h index 9963dc04d..f4b44a57f 100644 --- a/src/DlgRef/DlgRef_3Sel_QTD.h +++ b/src/DlgRef/DlgRef_3Sel_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_3Sel_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Spin.cxx b/src/DlgRef/DlgRef_3Spin.cxx index 07237c2ed..bd2f5cee8 100644 --- a/src/DlgRef/DlgRef_3Spin.cxx +++ b/src/DlgRef/DlgRef_3Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Spin.h b/src/DlgRef/DlgRef_3Spin.h index eabf34d3e..18ca9f610 100644 --- a/src/DlgRef/DlgRef_3Spin.h +++ b/src/DlgRef/DlgRef_3Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Spin1Check.cxx b/src/DlgRef/DlgRef_3Spin1Check.cxx index 7e622ab82..2cf12b7e7 100644 --- a/src/DlgRef/DlgRef_3Spin1Check.cxx +++ b/src/DlgRef/DlgRef_3Spin1Check.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Spin1Check.h b/src/DlgRef/DlgRef_3Spin1Check.h index 2a256cf04..36c5fc2ac 100644 --- a/src/DlgRef/DlgRef_3Spin1Check.h +++ b/src/DlgRef/DlgRef_3Spin1Check.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_3Spin1Check_QTD.cxx b/src/DlgRef/DlgRef_3Spin1Check_QTD.cxx index 12f779933..2be55011e 100644 --- a/src/DlgRef/DlgRef_3Spin1Check_QTD.cxx +++ b/src/DlgRef/DlgRef_3Spin1Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_3Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Spin1Check_QTD.h b/src/DlgRef/DlgRef_3Spin1Check_QTD.h index fc59ff9cb..6df92fb08 100644 --- a/src/DlgRef/DlgRef_3Spin1Check_QTD.h +++ b/src/DlgRef/DlgRef_3Spin1Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_3Spin1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Spin_QTD.cxx b/src/DlgRef/DlgRef_3Spin_QTD.cxx index 57823e5f5..99a1d464e 100644 --- a/src/DlgRef/DlgRef_3Spin_QTD.cxx +++ b/src/DlgRef/DlgRef_3Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_3Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_3Spin_QTD.h b/src/DlgRef/DlgRef_3Spin_QTD.h index 5f5eb1100..7f76b90b5 100644 --- a/src/DlgRef/DlgRef_3Spin_QTD.h +++ b/src/DlgRef/DlgRef_3Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_3Spin_QTD.ui' diff --git a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.cxx b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.cxx index 14bf1ec8b..c47a7a47e 100644 --- a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.cxx +++ b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_4Sel1List1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h index 2a8091851..3d4a9a42f 100644 --- a/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h +++ b/src/DlgRef/DlgRef_4Sel1List1Check_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_4Sel1List1Check_QTD.ui' diff --git a/src/DlgRef/DlgRef_4Sel1List_QTD.cxx b/src/DlgRef/DlgRef_4Sel1List_QTD.cxx index d6e5b2086..1c7c3a6ea 100644 --- a/src/DlgRef/DlgRef_4Sel1List_QTD.cxx +++ b/src/DlgRef/DlgRef_4Sel1List_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_4Sel1List_QTD.ui' diff --git a/src/DlgRef/DlgRef_4Sel1List_QTD.h b/src/DlgRef/DlgRef_4Sel1List_QTD.h index 6b9978da5..d391942f9 100644 --- a/src/DlgRef/DlgRef_4Sel1List_QTD.h +++ b/src/DlgRef/DlgRef_4Sel1List_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_4Sel1List_QTD.ui' diff --git a/src/DlgRef/DlgRef_6Sel_QTD.cxx b/src/DlgRef/DlgRef_6Sel_QTD.cxx index c3f541853..bc3ebe641 100644 --- a/src/DlgRef/DlgRef_6Sel_QTD.cxx +++ b/src/DlgRef/DlgRef_6Sel_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_6Sel_QTD.ui' diff --git a/src/DlgRef/DlgRef_6Sel_QTD.h b/src/DlgRef/DlgRef_6Sel_QTD.h index d78ffd939..517c3a5aa 100644 --- a/src/DlgRef/DlgRef_6Sel_QTD.h +++ b/src/DlgRef/DlgRef_6Sel_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_6Sel_QTD.ui' diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.cxx b/src/DlgRef/DlgRef_Skeleton_QTD.cxx index f16b05e10..dddb3e087 100644 --- a/src/DlgRef/DlgRef_Skeleton_QTD.cxx +++ b/src/DlgRef/DlgRef_Skeleton_QTD.cxx @@ -15,44 +15,43 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'DlgRef_Skeleton_QTD.ui' ** -** Created: Wed Aug 11 18:42:51 2004 -** by: The User Interface Compiler (uic) +** Created: Fri Mar 17 11:18:06 2006 +** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! ****************************************************************************/ + #include "DlgRef_Skeleton_QTD.h" #include -#include -#include -#include -#include #include +#include +#include #include +#include +#include #include #include #include -/* - * Constructs a DlgRef_Skeleton_QTD which is a child of 'parent', with the +/* + * Constructs a DlgRef_Skeleton_QTD as a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bool modal, WFlags fl ) +DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { if ( !name ) setName( "DlgRef_Skeleton_QTD" ); - resize( 307, 378 ); setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setCaption( trUtf8( "DlgRef_Skeleton_QTD" ) ); setSizeGripEnabled( TRUE ); DlgRef_Skeleton_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "DlgRef_Skeleton_QTDLayout"); @@ -60,13 +59,11 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo GroupMedium = new QGroupBox( this, "GroupMedium" ); GroupMedium->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupMedium->sizePolicy().hasHeightForWidth() ) ); - GroupMedium->setTitle( trUtf8( "" ) ); Layout1->addWidget( GroupMedium, 2, 0 ); GroupButtons = new QGroupBox( this, "GroupButtons" ); GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) ); - GroupButtons->setTitle( trUtf8( "" ) ); GroupButtons->setColumnLayout(0, Qt::Vertical ); GroupButtons->layout()->setSpacing( 6 ); GroupButtons->layout()->setMargin( 11 ); @@ -76,25 +73,24 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo Layout3 = new QHBoxLayout( 0, 0, 6, "Layout3"); buttonOk = new QPushButton( GroupButtons, "buttonOk" ); - buttonOk->setText( trUtf8( "&Ok" ) ); Layout3->addWidget( buttonOk ); buttonApply = new QPushButton( GroupButtons, "buttonApply" ); - buttonApply->setText( trUtf8( "&Apply" ) ); Layout3->addWidget( buttonApply ); - QSpacerItem* spacer = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); - Layout3->addItem( spacer ); + Spacer1 = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); + Layout3->addItem( Spacer1 ); buttonCancel = new QPushButton( GroupButtons, "buttonCancel" ); - buttonCancel->setText( trUtf8( "&Cancel" ) ); Layout3->addWidget( buttonCancel ); + + buttonHelp = new QPushButton( GroupButtons, "buttonHelp" ); + Layout3->addWidget( buttonHelp ); GroupButtonsLayout->addLayout( Layout3 ); Layout1->addWidget( GroupButtons, 3, 0 ); GroupConstructors = new QButtonGroup( this, "GroupConstructors" ); GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) ); - GroupConstructors->setTitle( trUtf8( "" ) ); GroupConstructors->setColumnLayout(0, Qt::Vertical ); GroupConstructors->layout()->setSpacing( 6 ); GroupConstructors->layout()->setMargin( 11 ); @@ -104,26 +100,21 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2"); RadioButton1 = new QRadioButton( GroupConstructors, "RadioButton1" ); - RadioButton1->setText( trUtf8( "" ) ); Layout2->addWidget( RadioButton1 ); RadioButton2 = new QRadioButton( GroupConstructors, "RadioButton2" ); - RadioButton2->setText( trUtf8( "" ) ); Layout2->addWidget( RadioButton2 ); RadioButton3 = new QRadioButton( GroupConstructors, "RadioButton3" ); - RadioButton3->setText( trUtf8( "" ) ); Layout2->addWidget( RadioButton3 ); RadioButton4 = new QRadioButton( GroupConstructors, "RadioButton4" ); - RadioButton4->setText( trUtf8( "" ) ); Layout2->addWidget( RadioButton4 ); GroupConstructorsLayout->addLayout( Layout2 ); Layout1->addWidget( GroupConstructors, 0, 0 ); GroupBoxName = new QGroupBox( this, "GroupBoxName" ); - GroupBoxName->setTitle( trUtf8( "Result name" ) ); GroupBoxName->setColumnLayout(0, Qt::Vertical ); GroupBoxName->layout()->setSpacing( 6 ); GroupBoxName->layout()->setMargin( 11 ); @@ -137,7 +128,6 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo Layout66->addWidget( ResultName, 0, 1 ); NameLabel = new QLabel( GroupBoxName, "NameLabel" ); - NameLabel->setText( trUtf8( "Name" ) ); Layout66->addWidget( NameLabel, 0, 0 ); @@ -146,9 +136,12 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, bo Layout1->addWidget( GroupBoxName, 1, 0 ); DlgRef_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 ); + languageChange(); + resize( QSize(307, 378).expandedTo(minimumSizeHint()) ); + clearWState( WState_Polished ); } -/* +/* * Destroys the object and frees any allocated resources */ DlgRef_Skeleton_QTD::~DlgRef_Skeleton_QTD() @@ -156,3 +149,25 @@ DlgRef_Skeleton_QTD::~DlgRef_Skeleton_QTD() // no need to delete child widgets, Qt does it all for us } +/* + * Sets the strings of the subwidgets using the current + * language. + */ +void DlgRef_Skeleton_QTD::languageChange() +{ + setCaption( tr( "DlgRef_Skeleton_QTD" ) ); + GroupMedium->setTitle( QString::null ); + GroupButtons->setTitle( QString::null ); + buttonOk->setText( tr( "&Ok" ) ); + buttonApply->setText( tr( "&Apply" ) ); + buttonCancel->setText( tr( "&Cancel" ) ); + buttonHelp->setText( tr( "&Help" ) ); + GroupConstructors->setTitle( QString::null ); + RadioButton1->setText( QString::null ); + RadioButton2->setText( QString::null ); + RadioButton3->setText( QString::null ); + RadioButton4->setText( QString::null ); + GroupBoxName->setTitle( tr( "Result name" ) ); + NameLabel->setText( tr( "Name" ) ); +} + diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.h b/src/DlgRef/DlgRef_Skeleton_QTD.h index ac019c278..511d48993 100644 --- a/src/DlgRef/DlgRef_Skeleton_QTD.h +++ b/src/DlgRef/DlgRef_Skeleton_QTD.h @@ -15,16 +15,17 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'DlgRef_Skeleton_QTD.ui' ** -** Created: Wed Aug 11 18:42:51 2004 -** by: The User Interface Compiler (uic) +** Created: Fri Mar 17 11:18:06 2006 +** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! ****************************************************************************/ + #ifndef DLGREF_SKELETON_QTD_H #define DLGREF_SKELETON_QTD_H @@ -32,18 +33,20 @@ #include #include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QButtonGroup; + +class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; +class QSpacerItem; class QGroupBox; -class QLabel; -class QLineEdit; class QPushButton; +class QButtonGroup; class QRadioButton; +class QLineEdit; +class QLabel; class GEOM_DLGREF_EXPORT DlgRef_Skeleton_QTD : public QDialog -{ +{ Q_OBJECT public: @@ -55,6 +58,7 @@ public: QPushButton* buttonOk; QPushButton* buttonApply; QPushButton* buttonCancel; + QPushButton* buttonHelp; QButtonGroup* GroupConstructors; QRadioButton* RadioButton1; QRadioButton* RadioButton2; @@ -64,16 +68,20 @@ public: QLineEdit* ResultName; QLabel* NameLabel; - protected: QGridLayout* DlgRef_Skeleton_QTDLayout; QGridLayout* Layout1; QHBoxLayout* GroupButtonsLayout; QHBoxLayout* Layout3; + QSpacerItem* Spacer1; QHBoxLayout* GroupConstructorsLayout; QHBoxLayout* Layout2; QGridLayout* GroupBoxNameLayout; QGridLayout* Layout66; + +protected slots: + virtual void languageChange(); + }; #endif // DLGREF_SKELETON_QTD_H diff --git a/src/DlgRef/DlgRef_SpinBox.cxx b/src/DlgRef/DlgRef_SpinBox.cxx index fde1b235e..af86865ab 100644 --- a/src/DlgRef/DlgRef_SpinBox.cxx +++ b/src/DlgRef/DlgRef_SpinBox.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/DlgRef_SpinBox.h b/src/DlgRef/DlgRef_SpinBox.h index 9d9b94fea..1d7e4a036 100644 --- a/src/DlgRef/DlgRef_SpinBox.h +++ b/src/DlgRef/DlgRef_SpinBox.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/DlgRef/Makefile.in b/src/DlgRef/Makefile.in index 4d92b6376..5d8b604ba 100644 --- a/src/DlgRef/Makefile.in +++ b/src/DlgRef/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -150,9 +150,9 @@ LIB_CLIENT_IDL = LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += $(QT_MT_LIBS) -L${GUI_ROOT_DIR}/lib/salome -lqtx +LDFLAGS += $(QT_MT_LIBS) $(GUI_LDFLAGS) -lqtx @CONCLUDE@ diff --git a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui index 1098d6c46..b675f277c 100644 --- a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui +++ b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui @@ -105,7 +105,7 @@ 6 - + buttonOk @@ -146,6 +146,14 @@ &Cancel + + + buttonHelp + + + &Help + + diff --git a/src/DlgRef/UIFiles/ui_to_cxx b/src/DlgRef/UIFiles/ui_to_cxx index 4c4c512b8..417de861e 100755 --- a/src/DlgRef/UIFiles/ui_to_cxx +++ b/src/DlgRef/UIFiles/ui_to_cxx @@ -1,22 +1,22 @@ -// Copyright (C) 2005 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.salome-platform.org/ -// +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# #!/bin/sh #uic -o DlgRef_Skeleton_QTD.h DlgRef_Skeleton_QTD.ui diff --git a/src/EntityGUI/EntityGUI.cxx b/src/EntityGUI/EntityGUI.cxx index ce6d0cfc4..9fd2a6380 100644 --- a/src/EntityGUI/EntityGUI.cxx +++ b/src/EntityGUI/EntityGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -35,10 +35,8 @@ #include "SUIT_ViewWindow.h" #include "OCCViewer_ViewModel.h" #include "OCCViewer_ViewManager.h" -//#include "SVTK_ViewModel.h" #include "SalomeApp_Study.h" #include "SalomeApp_Tools.h" -//#include "SALOMEGUI_ImportOperation.h" #include #include @@ -52,19 +50,13 @@ using namespace boost; using namespace std; -EntityGUI* EntityGUI::myGUIObject = 0; - //======================================================================= // function : GetEntityGUI() // purpose : Get the only EntityGUI object [ static ] //======================================================================= EntityGUI* EntityGUI::GetEntityGUI( GeometryGUI* parent ) { - if ( myGUIObject == 0 ) { - // init EntityGUI only once - myGUIObject = new EntityGUI( parent ); - } - return myGUIObject; + return new EntityGUI( parent ); } //======================================================================= @@ -73,14 +65,10 @@ EntityGUI* EntityGUI::GetEntityGUI( GeometryGUI* parent ) //======================================================================= EntityGUI::EntityGUI( GeometryGUI* parent ) : GEOMGUI( parent ) { - myGeomBase = new GEOMBase(); - myGeom = GEOM::GEOM_Gen::_duplicate( GeometryGUI::GetGeomGen() ); - mySimulationShape1 = new AIS_Shape(TopoDS_Shape()); mySimulationShape2 = new AIS_Shape(TopoDS_Shape()); } - //======================================================================= // function : ~EntityGUI() // purpose : Destructor @@ -106,7 +94,7 @@ bool EntityGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) aDlg = new EntityGUI_SketcherDlg(getGeometryGUI(), parent, ""); break; case 407: // EXPLODE : use ic - aDlg = new EntityGUI_SubShapeDlg(parent, ""); + aDlg = new EntityGUI_SubShapeDlg(getGeometryGUI(), parent, ""); break; default: SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); @@ -114,35 +102,8 @@ bool EntityGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) } if ( aDlg ) aDlg->show(); - - return true; -} - - -//======================================================================= -// function : OnSketchEnd() -// purpose : -//======================================================================= -void EntityGUI::OnSketchEnd(const char *Cmd) -{ - /* QAD_Application::getDesktop()->putInfo("Create sketch functionality is NOT implemented in new GEOM kernel - (no such Corba interface method). Waiting for SRN to create it..."); - try { - GEOM::GEOM_Shape_var result = myGeom->MakeSketcher(Cmd); - if(result->_is_nil()) { - QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_NULLSHAPE")); - return; - } - result->NameType(tr("GEOM_WIRE")); - if(myGeomBase->Display(result)) - QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_DONE")); - } - catch(const SALOME::SALOME_Exception& S_ex) { - SalomeApp_Tools::QtCatchCorbaException(S_ex); - } - */ - return; + return true; } @@ -152,20 +113,19 @@ void EntityGUI::OnSketchEnd(const char *Cmd) //===================================================================================== void EntityGUI::DisplaySimulationShape(const TopoDS_Shape& S1, const TopoDS_Shape& S2) { - //NRI DEBUG : 14/02/2002 - if( SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() - != OCCViewer_Viewer::Type() ) + SUIT_ViewManager* aVM = + SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager(); + if (aVM->getType() != OCCViewer_Viewer::Type()) return; - OCCViewer_Viewer* v3d = - ((OCCViewer_ViewManager*)(SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()))->getOCCViewer(); + OCCViewer_Viewer* v3d = ((OCCViewer_ViewManager*)aVM)->getOCCViewer(); Handle(AIS_InteractiveContext) ic = v3d->getAISContext(); try { - if(!S1.IsNull()) { + if (!S1.IsNull()) { /* erase any previous */ ic->Erase(mySimulationShape1, Standard_True, Standard_False); ic->ClearPrs(mySimulationShape1); - + mySimulationShape1 = new AIS_Shape(TopoDS_Shape()); mySimulationShape1->Set(S1); mySimulationShape1->SetColor(Quantity_NOC_RED); @@ -174,7 +134,7 @@ void EntityGUI::DisplaySimulationShape(const TopoDS_Shape& S1, const TopoDS_Shap ic->Display(mySimulationShape1, Standard_False); mySimulationShape1->UnsetColor(); } - if(!S2.IsNull()) { + if (!S2.IsNull()) { ic->Erase(mySimulationShape2, Standard_True, Standard_False); ic->ClearPrs(mySimulationShape2); @@ -194,7 +154,6 @@ void EntityGUI::DisplaySimulationShape(const TopoDS_Shape& S1, const TopoDS_Shap return; } - //================================================================================== // function : EraseSimulationShape() // purpose : Clears the display of 'mySimulationShape' a pure graphical shape @@ -229,7 +188,8 @@ void EntityGUI::EraseSimulationShape() //===================================================================================== bool EntityGUI::SObjectExist(const _PTR(SObject)& theFatherObject, const char* IOR) { - SalomeApp_Study* appStudy = dynamic_cast( SUIT_Session::session()->activeApplication()->activeStudy() ); + SalomeApp_Study* appStudy = dynamic_cast + ( SUIT_Session::session()->activeApplication()->activeStudy() ); if ( !appStudy ) return false; _PTR(Study) aStudy = appStudy->studyDS(); _PTR(ChildIterator) it ( aStudy->NewChildIterator(theFatherObject) ); @@ -254,416 +214,6 @@ bool EntityGUI::SObjectExist(const _PTR(SObject)& theFatherObject, const char* I } -//===================================================================================== -// function : OnSubShapeGetAll() -// purpose : Explode a shape in all sub shapes with a SubShapeType -//===================================================================================== -bool EntityGUI::OnSubShapeGetAll(const TopoDS_Shape& ShapeTopo, const char* ShapeTopoIOR, const int SubShapeType) -{ - SUIT_Session::session()->activeApplication()->putInfo("OnSubShapeGetAll method from EntityGUI should be reimplemented ..."); - /* - SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument(); - SALOMEDS::SObject_var theObj = aStudy->FindObjectIOR(ShapeTopoIOR); - if(theObj->_is_nil()) { - QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_SHAPE_IN_STUDY")); - return false; - } - - SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); - SALOMEDS::SObject_var fatherSF = aStudy->FindObjectID(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->entry()); - SALOMEDS::GenericAttribute_var anAttr; - SALOMEDS::AttributeName_var aName; - SALOMEDS::AttributeIOR_var anIOR; - SALOMEDS::AttributePixMap_var aPixmap; - - // We create a sub object for each sub shape as attribute of the main object - // Each sub object contains list (length=1) containing its index in the main shape - GEOM::GEOM_Shape_var aShape = myGeom->GetIORFromString(ShapeTopoIOR); - GEOM::GEOM_Gen::ListOfGeomShapes_var listGeomShapes = new GEOM::GEOM_Gen::ListOfGeomShapes; - GEOM::GEOM_Shape_var aResult; - - try { - listGeomShapes = myGeom->SubShapeAll(aShape, SubShapeType); - if(listGeomShapes->length() < 1) { - QAD_Application::getDesktop()->putInfo (tr("GEOM_PRP_ABORT")); - return false; - } - } - catch(const SALOME::SALOME_Exception& S_ex) { - SalomeApp_Tools::QtCatchCorbaException(S_ex); - } - - // open transaction - QAD_Operation* op = new SALOMEGUI_ImportOperation(QAD_Application::getDesktop()->getActiveStudy()); - op->start(); - - TopoDS_Shape mainTopo = myGeomGUI->GetShapeReader().GetShape(myGeom, aShape); - TopoDS_Shape mainShape; - bool main = false; - while(!main) { - if(aShape->IsMainShape()) { - mainShape = myGeomGUI->GetShapeReader().GetShape(myGeom, aShape); - main = true; - } - else - aShape = myGeom->GetIORFromString(aShape->MainName()); - } - - // Loop on each sub shape created - // int i = 1 ; index for the nameType - for(int j=0; jlength(); j++) { - // Get each sub shape extracted CORBA and OCC - aResult = listGeomShapes[j] ; - TopoDS_Shape S = myGeomGUI->GetShapeReader().GetShape(myGeom, aResult); - - if (S.IsNull()) { - QAD_Application::getDesktop()->putInfo (tr("GEOM_PRP_ABORT")); - return false; - } - - // Set the nameType of sub shape - char* nameG = (char *)malloc(20); - Standard_CString Type; - if(myGeomBase->GetShapeTypeString(S, Type)) { - aResult->NameType(Type); - sprintf(nameG, "%s_%d", Type, myGeomBase->GetIndex(S, mainShape, SubShapeType)); - } - else { - aResult->NameType(tr("GEOM_SHAPE")); - sprintf(nameG, "%s_%d", tr("GEOM_SHAPE").latin1(), myGeomGUI->myNbGeom++); - } - SALOMEDS::SObject_var SO = aStudy->FindObjectIOR(aResult->Name()); - - bool allreadyexist = false; - - if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_OCC) { - OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); - Handle (AIS_InteractiveContext) ic = v3d->getAISContext(); - - Handle(GEOM_AISShape) result = new GEOM_AISShape(S, nameG); - Handle(GEOM_InteractiveObject) IO = new GEOM_InteractiveObject(aResult->Name(), myGeomGUI->GetFatherior(), "GEOM"); - - MESSAGE ("SO->_is_nil() " << SO->_is_nil()) - - if(SO->_is_nil()) { - SALOMEDS::SObject_var newObj = aStudyBuilder->NewObject(theObj); - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeName"); - aName = SALOMEDS::AttributeName::_narrow(anAttr); - aName->SetValue(nameG); - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeIOR"); - anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr); - anIOR->SetValue(aResult->Name()); - - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributePixMap"); - aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); - MESSAGE(" Type " << S.ShapeType()) - if (S.ShapeType() == TopAbs_COMPOUND) - aPixmap->SetPixMap("ICON_OBJBROWSER_COMPOUND"); - else if(S.ShapeType() == TopAbs_COMPSOLID) - aPixmap->SetPixMap("ICON_OBJBROWSER_COMPSOLID"); - else if(S.ShapeType() == TopAbs_SOLID) - aPixmap->SetPixMap("ICON_OBJBROWSER_SOLID"); - else if(S.ShapeType() == TopAbs_SHELL) - aPixmap->SetPixMap("ICON_OBJBROWSER_SHELL"); - else if(S.ShapeType() == TopAbs_FACE) - aPixmap->SetPixMap("ICON_OBJBROWSER_FACE"); - else if(S.ShapeType() == TopAbs_WIRE) - aPixmap->SetPixMap("ICON_OBJBROWSER_WIRE"); - else if(S.ShapeType() == TopAbs_EDGE) - aPixmap->SetPixMap("ICON_OBJBROWSER_EDGE"); - else if(S.ShapeType() == TopAbs_VERTEX) - aPixmap->SetPixMap("ICON_OBJBROWSER_VERTEX"); - - MESSAGE(" aPixmap->GetPixMap " << aPixmap->GetPixMap()) - - SALOMEDS::SObject_var newObj1 = aStudyBuilder->NewObject(fatherSF); - aStudyBuilder->Addreference(newObj1, newObj); - IO->setEntry(newObj->GetID()); - - aResult->StudyShapeId(newObj->GetID()); - } - else { - allreadyexist = true; - if(!this->SObjectExist(theObj, aResult->Name())) { - SALOMEDS::SObject_var newObj1 = aStudyBuilder->NewObject(theObj); - aStudyBuilder->Addreference(newObj1, SO); - IO->setEntry(SO->GetID()); - aResult->StudyShapeId(SO->GetID()); - } - } - - result->setIO(IO); - result->setName(nameG); - if(!allreadyexist) - ic->Display(result); - - } - else if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() == VIEW_VTK) { - SVTK_ViewFrame* vf = dynamic_cast( QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame() ); - SVTK_RenderWindowInteractor* myRenderInter= vf ? vf->getRWInteractor() : 0; - - int themode = myRenderInter->GetDisplayMode(); - vtkRenderer *theRenderer = vf->getRenderer(); - vtkRenderWindow *renWin = theRenderer->GetRenderWindow(); - - Handle(GEOM_InteractiveObject) IO = new GEOM_InteractiveObject(aResult->Name(), myGeomGUI->GetFatherior(), "GEOM"); - - if(SO->_is_nil()) { - SALOMEDS::SObject_var newObj = aStudyBuilder->NewObject(theObj); - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeIOR"); - anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr); - anIOR->SetValue(aResult->Name()); - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeName"); - aName = SALOMEDS::AttributeName::_narrow(anAttr); - aName->SetValue(nameG); - - anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributePixMap"); - aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); - if(S.ShapeType() == TopAbs_COMPOUND) - aPixmap->SetPixMap("ICON_OBJBROWSER_COMPOUND"); - else if(S.ShapeType() == TopAbs_COMPSOLID) - aPixmap->SetPixMap("ICON_OBJBROWSER_COMPSOLID"); - else if(S.ShapeType() == TopAbs_SOLID) - aPixmap->SetPixMap("ICON_OBJBROWSER_SOLID"); - else if(S.ShapeType() == TopAbs_SHELL) - aPixmap->SetPixMap("ICON_OBJBROWSER_SHELL"); - else if(S.ShapeType() == TopAbs_FACE) - aPixmap->SetPixMap("ICON_OBJBROWSER_FACE"); - else if(S.ShapeType() == TopAbs_WIRE) - aPixmap->SetPixMap("ICON_OBJBROWSER_WIRE"); - else if(S.ShapeType() == TopAbs_EDGE) - aPixmap->SetPixMap("ICON_OBJBROWSER_EDGE"); - else if(S.ShapeType() == TopAbs_VERTEX) - aPixmap->SetPixMap("ICON_OBJBROWSER_VERTEX"); - - SALOMEDS::SObject_var newObj1 = aStudyBuilder->NewObject(fatherSF); - aStudyBuilder->Addreference(newObj1, newObj); - IO->setEntry(newObj->GetID()); - } - else { - allreadyexist = true; - if(!this->SObjectExist(theObj, aResult->Name())) { - SALOMEDS::SObject_var newObj1 = aStudyBuilder->NewObject(theObj); - aStudyBuilder->Addreference(newObj1, SO); - IO->setEntry(SO->GetID()); - } - } - - if(!allreadyexist) { - vtkActorCollection* theActors = GEOM_AssemblyBuilder::BuildActors(S,0,themode,Standard_True); - theActors->InitTraversal(); - vtkActor* anActor = (vtkActor*)theActors->GetNextActor(); - while(!(anActor==NULL)) { - GEOM_Actor* GActor = GEOM_Actor::SafeDownCast(anActor); - GActor->setIO(IO); - GActor->setName(nameG); - theRenderer->AddActor(GActor); - renWin->Render(); - anActor = (vtkActor*)theActors->GetNextActor(); - } - } - } - } - - // commit transaction - op->finish(); - - QAD_Application::getDesktop()->getActiveStudy()->updateObjBrowser(); - QAD_Application::getDesktop()->putInfo (tr("GEOM_PRP_READY")); - */ - return true; -} - - -//===================================================================================== -// function : OnSubShapeGetSelected() -// purpose : -//===================================================================================== -bool EntityGUI::OnSubShapeGetSelected(const TopoDS_Shape& ShapeTopo, const char* ShapeTopoIOR, const int SubShapeType, Standard_Integer& aLocalContextId, bool& myUseLocalContext) -{ - SUIT_Session::session()->activeApplication()->putInfo("OnSubShapeGetSelected method from EntityGUI should be reimplemented ..."); - // //* Test the type of viewer */ -// if(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getTypeView() > VIEW_OCC) -// return false; - -// SALOMEDS::Study_var aStudy = QAD_Application::getDesktop()->getActiveStudy()->getStudyDocument(); -// SALOMEDS::SObject_var theObj = aStudy->FindObjectIOR(ShapeTopoIOR); -// if(theObj->_is_nil()) { -// QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_SHAPE_IN_STUDY")); -// return false; -// } - -// OCCViewer_Viewer3d* v3d = ((OCCViewer_ViewFrame*)QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->getRightFrame()->getViewFrame())->getViewer(); -// Handle(AIS_InteractiveContext) ic = v3d->getAISContext(); - -// if( myUseLocalContext == false ) { -// /* local context is from DialogBox */ -// MESSAGE("Error : No local context opened for sub shapes method" << endl ) ; -// return false ; -// } - -// GEOM::GEOM_Shape_var aShape = myGeom->GetIORFromString( ShapeTopoIOR ); -// TopoDS_Shape mainTopo = myGeomGUI->GetShapeReader().GetShape(myGeom, aShape); - -// TopoDS_Shape mainShape; -// bool main = false; -// while(!main) { -// if(aShape->IsMainShape()) { -// mainShape = myGeomGUI->GetShapeReader().GetShape(myGeom, aShape); -// main = true; -// } -// else -// aShape = myGeom->GetIORFromString(aShape->MainName()); -// } - -// GEOM::GEOM_Shape::ListOfSubShapeID_var ListOfID = new GEOM::GEOM_Shape::ListOfSubShapeID; -// ic->InitSelected(); -// int nbSelected = ic->NbSelected(); -// ListOfID->length(nbSelected); - -// TopoDS_Compound compound; -// ic->InitSelected(); /* to init again */ -// BRep_Builder B; -// B.MakeCompound(compound); - -// int i = 0; -// /* We create a unique compound containing all the sub shapes selected by user as attribute of the main shape */ -// /* the compound is homogenous by selection */ -// while(ic->MoreSelected()) { -// int index = myGeomBase->GetIndex(ic->SelectedShape(), mainShape, SubShapeType); -// ListOfID[i] = index; -// B.Add(compound, ic->SelectedShape()); -// i++; -// ic->NextSelected(); -// } - -// /* Test if user has selected sub shapes */ -// if(ListOfID->length() < 1) -// return false; - -// GEOM::GEOM_Shape_var aResult; -// try { -// aResult = myGeom->SubShape(aShape, SubShapeType, ListOfID); -// } -// catch (const SALOME::SALOME_Exception& S_ex) { -// SalomeApp_Tools::QtCatchCorbaException(S_ex); -// } - -// /* local context from DialogBox */ -// ic->CloseLocalContext(aLocalContextId); -// myUseLocalContext = false ; - -// char* nameG = (char *)malloc(20); -// Standard_CString Type; - -// Handle(GEOM_AISShape) result; -// Handle(GEOM_InteractiveObject) IO; - -// if(nbSelected == 1) { -// TopExp_Explorer Exp (compound, TopAbs_ShapeEnum(SubShapeType)); -// if(Exp.More()) { -// if(myGeomBase->GetShapeTypeString(Exp.Current(),Type)) { -// aResult->NameType(Type); -// sprintf (nameG, "%s_%d", Type, myGeomBase->GetIndex( Exp.Current(), mainTopo, SubShapeType)); -// } -// else { -// aResult->NameType(tr("GEOM_SHAPE")); -// sprintf (nameG, "%s_%d", tr("GEOM_SHAPE").latin1(), myGeomGUI->myNbGeom++); -// } -// result = new GEOM_AISShape(Exp.Current(), nameG); -// IO = new GEOM_InteractiveObject(aResult->Name(), myGeomGUI->GetFatherior(), "GEOM"); -// } -// } -// else { -// if ( myGeomBase->GetShapeTypeString(compound,Type)) { -// aResult->NameType(Type); -// sprintf (nameG, "%s_%d", Type, myGeomGUI->myNbGeom++); -// } else { -// aResult->NameType(tr("GEOM_SHAPE")); -// sprintf (nameG, "%s_%d", tr("GEOM_SHAPE").latin1(), myGeomGUI->myNbGeom++); -// } -// result = new GEOM_AISShape(compound, nameG); -// IO = new GEOM_InteractiveObject(aResult->Name(), myGeomGUI->GetFatherior(), "GEOM"); -// } - -// SALOMEDS::SObject_var SO = aStudy->FindObjectIOR(aResult->Name()); - -// /* open transaction */ -// QAD_Operation* op = new SALOMEGUI_ImportOperation(QAD_Application::getDesktop()->getActiveStudy()); -// op->start(); - -// SALOMEDS::StudyBuilder_var aStudyBuilder = aStudy->NewBuilder(); -// SALOMEDS::SObject_var fatherSF = aStudy->FindObjectID(QAD_Application::getDesktop()->getActiveStudy()->getActiveStudyFrame()->entry()); -// SALOMEDS::GenericAttribute_var anAttr; -// SALOMEDS::AttributeName_var aName; -// SALOMEDS::AttributeIOR_var anIOR; -// SALOMEDS::AttributePixMap_var aPixmap; - -// bool allreadyexist = false; - -// if(SO->_is_nil()) { -// SALOMEDS::SObject_var newObj = aStudyBuilder->NewObject(theObj); -// anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeIOR"); -// anIOR = SALOMEDS::AttributeIOR::_narrow(anAttr); -// anIOR->SetValue(aResult->Name()); -// anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributeName"); -// aName = SALOMEDS::AttributeName::_narrow(anAttr); -// aName->SetValue(result->getName()); - -// anAttr = aStudyBuilder->FindOrCreateAttribute(newObj, "AttributePixMap"); -// aPixmap = SALOMEDS::AttributePixMap::_narrow(anAttr); -// if(result->Shape().ShapeType() == TopAbs_COMPOUND) -// aPixmap->SetPixMap("ICON_OBJBROWSER_COMPOUND"); -// else if(result->Shape().ShapeType() == TopAbs_COMPSOLID) -// aPixmap->SetPixMap("ICON_OBJBROWSER_COMPSOLID"); -// else if(result->Shape().ShapeType() == TopAbs_SOLID) -// aPixmap->SetPixMap("ICON_OBJBROWSER_SOLID"); -// else if(result->Shape().ShapeType() == TopAbs_SHELL) -// aPixmap->SetPixMap("ICON_OBJBROWSER_SHELL"); -// else if(result->Shape().ShapeType() == TopAbs_FACE) -// aPixmap->SetPixMap("ICON_OBJBROWSER_FACE"); -// else if(result->Shape().ShapeType() == TopAbs_WIRE) -// aPixmap->SetPixMap("ICON_OBJBROWSER_WIRE"); -// else if(result->Shape().ShapeType() == TopAbs_EDGE) -// aPixmap->SetPixMap("ICON_OBJBROWSER_EDGE"); -// else if(result->Shape().ShapeType() == TopAbs_VERTEX) -// aPixmap->SetPixMap("ICON_OBJBROWSER_VERTEX"); - -// SALOMEDS::SObject_var newObj1 = aStudyBuilder->NewObject(fatherSF); -// aStudyBuilder->Addreference(newObj1, newObj); - -// IO->setEntry(newObj->GetID()); -// aResult->StudyShapeId(newObj->GetID()); -// } -// else { -// allreadyexist = true; -// if(!this->SObjectExist(theObj, aResult->Name())) { -// SALOMEDS::SObject_var newObj1 = aStudyBuilder->NewObject(theObj); -// aStudyBuilder->Addreference(newObj1, SO); - -// IO->setEntry(SO->GetID()); -// aResult->StudyShapeId(SO->GetID()); -// } -// } - -// /* commit transaction */ -// op->finish(); - -// result->setIO(IO); -// result->setName(nameG); - -// if(!allreadyexist) -// ic->Display(result); - -// DisplayGUI* myDisplayGUI = new DisplayGUI(); -// myDisplayGUI->OnDisplayAll(true); - -// QAD_Application::getDesktop()->getActiveStudy()->updateObjBrowser(); -// QAD_Application::getDesktop()->putInfo (tr("GEOM_PRP_READY")); - return true; -} - - //===================================================================================== // EXPORTED METHODS //===================================================================================== diff --git a/src/EntityGUI/EntityGUI.h b/src/EntityGUI/EntityGUI.h index 8e9640e53..fbd7b78cb 100644 --- a/src/EntityGUI/EntityGUI.h +++ b/src/EntityGUI/EntityGUI.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : EntityGUI.h // Author : Damien COQUERET // Module : GEOM -// $Header$ #ifndef ENTITYGUI_H #define ENTITYGUI_H @@ -32,10 +31,12 @@ #include "GEOM_EntityGUI.hxx" #include "GEOMGUI.h" -#include "GEOMBase.h" #include "SALOMEDSClient.hxx" +#include +#include + //================================================================================= // class : EntityGUI // purpose : @@ -53,29 +54,15 @@ public : bool OnGUIEvent(int theCommandID, SUIT_Desktop* parent); - void OnSketchEnd(const char *Cmd); - void DisplaySimulationShape(const TopoDS_Shape& S1, const TopoDS_Shape& S2); void EraseSimulationShape(); - void MakeInterpolAndDisplay(GEOM::string_array& listShapesIOR); - void MakeBezierAndDisplay(GEOM::string_array& listShapesIOR); - - /* Methods for sub shapes explode */ + // Methods for sub shapes explode bool SObjectExist(const _PTR(SObject)& theFatherObject, const char* IOR); - bool OnSubShapeGetAll(const TopoDS_Shape& ShapeTopo, const char* ShapeTopoIOR, const int SubShapeType); - bool OnSubShapeGetSelected(const TopoDS_Shape& ShapeTopo, const char* ShapeTopoIOR, const int SubShapeType, - Standard_Integer& aLocalContextId, bool& myUseLocalContext); - /* AIS shape used only during topo/geom simulations */ + // AIS shape used only during topo/geom simulations Handle(AIS_Shape) mySimulationShape1; Handle(AIS_Shape) mySimulationShape2; - - GEOMBase* myGeomBase; - GEOM::GEOM_Gen_var myGeom; /* Current Geom Component */ - -private: - static EntityGUI* myGUIObject; // the only EntityGUI object }; #endif diff --git a/src/EntityGUI/EntityGUI_1Sel_QTD.cxx b/src/EntityGUI/EntityGUI_1Sel_QTD.cxx index 86fc4303d..be05efcad 100644 --- a/src/EntityGUI/EntityGUI_1Sel_QTD.cxx +++ b/src/EntityGUI/EntityGUI_1Sel_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'EntityGUI_1Sel_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_1Sel_QTD.h b/src/EntityGUI/EntityGUI_1Sel_QTD.h index 91732493e..401ddddc7 100644 --- a/src/EntityGUI/EntityGUI_1Sel_QTD.h +++ b/src/EntityGUI/EntityGUI_1Sel_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'EntityGUI_1Sel_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_1Spin.cxx b/src/EntityGUI/EntityGUI_1Spin.cxx index 131a45500..c8a62963f 100644 --- a/src/EntityGUI/EntityGUI_1Spin.cxx +++ b/src/EntityGUI/EntityGUI_1Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/EntityGUI/EntityGUI_1Spin.h b/src/EntityGUI/EntityGUI_1Spin.h index 681d9c1c9..5631e0bac 100644 --- a/src/EntityGUI/EntityGUI_1Spin.h +++ b/src/EntityGUI/EntityGUI_1Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.cxx b/src/EntityGUI/EntityGUI_1Spin_QTD.cxx index 1fcef95bf..98a476cef 100644 --- a/src/EntityGUI/EntityGUI_1Spin_QTD.cxx +++ b/src/EntityGUI/EntityGUI_1Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'EntityGUI_1Spin_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_1Spin_QTD.h b/src/EntityGUI/EntityGUI_1Spin_QTD.h index 877f3c348..e525552bb 100644 --- a/src/EntityGUI/EntityGUI_1Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_1Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'EntityGUI_1Spin_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_2Spin.cxx b/src/EntityGUI/EntityGUI_2Spin.cxx index b71d731ae..8ed08eccc 100644 --- a/src/EntityGUI/EntityGUI_2Spin.cxx +++ b/src/EntityGUI/EntityGUI_2Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/EntityGUI/EntityGUI_2Spin.h b/src/EntityGUI/EntityGUI_2Spin.h index 77183ecef..9d79e478a 100644 --- a/src/EntityGUI/EntityGUI_2Spin.h +++ b/src/EntityGUI/EntityGUI_2Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.cxx b/src/EntityGUI/EntityGUI_2Spin_QTD.cxx index ec8ed7648..b6f254d5a 100644 --- a/src/EntityGUI/EntityGUI_2Spin_QTD.cxx +++ b/src/EntityGUI/EntityGUI_2Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'EntityGUI_2Spin_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_2Spin_QTD.h b/src/EntityGUI/EntityGUI_2Spin_QTD.h index 9b107cea6..718f80e42 100644 --- a/src/EntityGUI/EntityGUI_2Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_2Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'EntityGUI_2Spin_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_3Spin.cxx b/src/EntityGUI/EntityGUI_3Spin.cxx index fe73aeba5..8a0fb7e53 100644 --- a/src/EntityGUI/EntityGUI_3Spin.cxx +++ b/src/EntityGUI/EntityGUI_3Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/EntityGUI/EntityGUI_3Spin.h b/src/EntityGUI/EntityGUI_3Spin.h index b829c46e4..4b612bdf1 100644 --- a/src/EntityGUI/EntityGUI_3Spin.h +++ b/src/EntityGUI/EntityGUI_3Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.cxx b/src/EntityGUI/EntityGUI_3Spin_QTD.cxx index 9734557a1..98dbf69c5 100644 --- a/src/EntityGUI/EntityGUI_3Spin_QTD.cxx +++ b/src/EntityGUI/EntityGUI_3Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'EntityGUI_3Spin_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_3Spin_QTD.h b/src/EntityGUI/EntityGUI_3Spin_QTD.h index 4d9669d17..1235b160b 100644 --- a/src/EntityGUI/EntityGUI_3Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_3Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'EntityGUI_3Spin_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_4Spin.cxx b/src/EntityGUI/EntityGUI_4Spin.cxx index 29aa398a1..76ea42b22 100644 --- a/src/EntityGUI/EntityGUI_4Spin.cxx +++ b/src/EntityGUI/EntityGUI_4Spin.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/EntityGUI/EntityGUI_4Spin.h b/src/EntityGUI/EntityGUI_4Spin.h index fda15b423..eeaf1965b 100644 --- a/src/EntityGUI/EntityGUI_4Spin.h +++ b/src/EntityGUI/EntityGUI_4Spin.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.cxx b/src/EntityGUI/EntityGUI_4Spin_QTD.cxx index 762940e84..8d8debd7e 100644 --- a/src/EntityGUI/EntityGUI_4Spin_QTD.cxx +++ b/src/EntityGUI/EntityGUI_4Spin_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'EntityGUI_4Spin_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_4Spin_QTD.h b/src/EntityGUI/EntityGUI_4Spin_QTD.h index a7ee98ba3..6ec375d90 100644 --- a/src/EntityGUI/EntityGUI_4Spin_QTD.h +++ b/src/EntityGUI/EntityGUI_4Spin_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'EntityGUI_4Spin_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_Dir1_QTD.cxx b/src/EntityGUI/EntityGUI_Dir1_QTD.cxx index 55a724512..9f051b216 100644 --- a/src/EntityGUI/EntityGUI_Dir1_QTD.cxx +++ b/src/EntityGUI/EntityGUI_Dir1_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'EntityGUI_Dir1_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_Dir1_QTD.h b/src/EntityGUI/EntityGUI_Dir1_QTD.h index 1b9d36e7e..6ca2a1137 100644 --- a/src/EntityGUI/EntityGUI_Dir1_QTD.h +++ b/src/EntityGUI/EntityGUI_Dir1_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'EntityGUI_Dir1_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_Dir2_QTD.cxx b/src/EntityGUI/EntityGUI_Dir2_QTD.cxx index 5db7d306f..bb509984b 100644 --- a/src/EntityGUI/EntityGUI_Dir2_QTD.cxx +++ b/src/EntityGUI/EntityGUI_Dir2_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'EntityGUI_Dir2_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_Dir2_QTD.h b/src/EntityGUI/EntityGUI_Dir2_QTD.h index 3a98f26a7..17480e83f 100644 --- a/src/EntityGUI/EntityGUI_Dir2_QTD.h +++ b/src/EntityGUI/EntityGUI_Dir2_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'EntityGUI_Dir2_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_Point_QTD.cxx b/src/EntityGUI/EntityGUI_Point_QTD.cxx index 0d2680e7a..bc2a482fd 100644 --- a/src/EntityGUI/EntityGUI_Point_QTD.cxx +++ b/src/EntityGUI/EntityGUI_Point_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'EntityGUI_Point_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_Point_QTD.h b/src/EntityGUI/EntityGUI_Point_QTD.h index eafa3d044..453b09807 100644 --- a/src/EntityGUI/EntityGUI_Point_QTD.h +++ b/src/EntityGUI/EntityGUI_Point_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'EntityGUI_Point_QTD.ui' diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx b/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx index 65e0b2444..863f45fe9 100644 --- a/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx +++ b/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx @@ -1,69 +1,66 @@ // Copyright (C) 2005 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 +// 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 +// +// 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 +// 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'EntityGUI_Skeleton_QTD.ui' ** -** Created: ven déc 12 11:17:08 2003 -** by: The User Interface Compiler (uic) +** Created: Fri Mar 17 15:47:14 2006 +** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! ****************************************************************************/ + #include "EntityGUI_Skeleton_QTD.h" #include -#include -#include #include +#include +#include #include #include #include #include -/* - * Constructs a EntityGUI_Skeleton_QTD which is a child of 'parent', with the +/* + * Constructs a EntityGUI_Skeleton_QTD as a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* name, bool modal, WFlags fl ) +EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { if ( !name ) setName( "EntityGUI_Skeleton_QTD" ); - resize( 317, 276 ); setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setCaption( trUtf8( "EntityGUI_Skeleton_QTD" ) ); EntityGUI_Skeleton_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "EntityGUI_Skeleton_QTDLayout"); Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); GroupVal = new QGroupBox( this, "GroupVal" ); GroupVal->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupVal->sizePolicy().hasHeightForWidth() ) ); - GroupVal->setTitle( trUtf8( "" ) ); Layout1->addWidget( GroupVal, 2, 0 ); GroupConstructors = new QButtonGroup( this, "GroupConstructors" ); GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) ); - GroupConstructors->setTitle( trUtf8( "Element Type" ) ); GroupConstructors->setColumnLayout(0, Qt::Vertical ); GroupConstructors->layout()->setSpacing( 6 ); GroupConstructors->layout()->setMargin( 11 ); @@ -73,11 +70,9 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* na Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2"); RadioButton1 = new QRadioButton( GroupConstructors, "RadioButton1" ); - RadioButton1->setText( trUtf8( "Segment" ) ); Layout2->addWidget( RadioButton1 ); RadioButton2 = new QRadioButton( GroupConstructors, "RadioButton2" ); - RadioButton2->setText( trUtf8( "Arc" ) ); Layout2->addWidget( RadioButton2 ); GroupConstructorsLayout->addLayout( Layout2, 0, 0 ); @@ -86,7 +81,6 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* na GroupDest = new QGroupBox( this, "GroupDest" ); GroupDest->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest->sizePolicy().hasHeightForWidth() ) ); - GroupDest->setTitle( trUtf8( "Destination" ) ); GroupDest->setColumnLayout(0, Qt::Vertical ); GroupDest->layout()->setSpacing( 6 ); GroupDest->layout()->setMargin( 11 ); @@ -97,7 +91,6 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* na GroupDest1 = new QButtonGroup( GroupDest, "GroupDest1" ); GroupDest1->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupDest1->sizePolicy().hasHeightForWidth() ) ); - GroupDest1->setTitle( trUtf8( "Type" ) ); GroupDest1->setColumnLayout(0, Qt::Vertical ); GroupDest1->layout()->setSpacing( 6 ); GroupDest1->layout()->setMargin( 11 ); @@ -107,12 +100,10 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* na Layout4 = new QGridLayout( 0, 1, 1, 0, 6, "Layout4"); RB_Dest2 = new QRadioButton( GroupDest1, "RB_Dest2" ); - RB_Dest2->setText( trUtf8( "Direction" ) ); Layout4->addWidget( RB_Dest2, 0, 1 ); RB_Dest1 = new QRadioButton( GroupDest1, "RB_Dest1" ); - RB_Dest1->setText( trUtf8( "Point" ) ); Layout4->addWidget( RB_Dest1, 0, 0 ); @@ -122,7 +113,6 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* na GroupDest2 = new QButtonGroup( GroupDest, "GroupDest2" ); GroupDest2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest2->sizePolicy().hasHeightForWidth() ) ); - GroupDest2->setTitle( trUtf8( "" ) ); GroupDest2->setColumnLayout(0, Qt::Vertical ); GroupDest2->layout()->setSpacing( 6 ); GroupDest2->layout()->setMargin( 11 ); @@ -133,7 +123,6 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* na GroupDest3 = new QButtonGroup( GroupDest, "GroupDest3" ); GroupDest3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest3->sizePolicy().hasHeightForWidth() ) ); - GroupDest3->setTitle( trUtf8( "" ) ); GroupDest3->setColumnLayout(0, Qt::Vertical ); GroupDest3->layout()->setSpacing( 6 ); GroupDest3->layout()->setMargin( 11 ); @@ -148,7 +137,6 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* na GroupButtons = new QGroupBox( this, "GroupButtons" ); GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) ); - GroupButtons->setTitle( trUtf8( "" ) ); GroupButtons->setColumnLayout(0, Qt::Vertical ); GroupButtons->layout()->setSpacing( 6 ); GroupButtons->layout()->setMargin( 11 ); @@ -158,23 +146,26 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* na Layout3 = new QHBoxLayout( 0, 0, 6, "Layout3"); buttonEnd = new QPushButton( GroupButtons, "buttonEnd" ); - buttonEnd->setText( trUtf8( "End Sketch" ) ); Layout3->addWidget( buttonEnd ); buttonClose = new QPushButton( GroupButtons, "buttonClose" ); - buttonClose->setText( trUtf8( "Close Sketch" ) ); Layout3->addWidget( buttonClose ); - QSpacerItem* spacer = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); - Layout3->addItem( spacer ); + Spacer1 = new QSpacerItem( 91, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); + Layout3->addItem( Spacer1 ); buttonCancel = new QPushButton( GroupButtons, "buttonCancel" ); - buttonCancel->setText( trUtf8( "&Cancel" ) ); Layout3->addWidget( buttonCancel ); + + buttonHelp = new QPushButton( GroupButtons, "buttonHelp" ); + Layout3->addWidget( buttonHelp ); GroupButtonsLayout->addLayout( Layout3 ); Layout1->addWidget( GroupButtons, 3, 0 ); EntityGUI_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 ); + languageChange(); + resize( QSize(317, 276).expandedTo(minimumSizeHint()) ); + clearWState( WState_Polished ); // tab order setTabOrder( RadioButton1, RadioButton2 ); @@ -185,7 +176,7 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* na setTabOrder( buttonClose, buttonCancel ); } -/* +/* * Destroys the object and frees any allocated resources */ EntityGUI_Skeleton_QTD::~EntityGUI_Skeleton_QTD() @@ -193,3 +184,27 @@ EntityGUI_Skeleton_QTD::~EntityGUI_Skeleton_QTD() // no need to delete child widgets, Qt does it all for us } +/* + * Sets the strings of the subwidgets using the current + * language. + */ +void EntityGUI_Skeleton_QTD::languageChange() +{ + setCaption( tr( "EntityGUI_Skeleton_QTD" ) ); + GroupVal->setTitle( QString::null ); + GroupConstructors->setTitle( tr( "Element Type" ) ); + RadioButton1->setText( tr( "Segment" ) ); + RadioButton2->setText( tr( "Arc" ) ); + GroupDest->setTitle( tr( "Destination" ) ); + GroupDest1->setTitle( tr( "Type" ) ); + RB_Dest2->setText( tr( "Direction" ) ); + RB_Dest1->setText( tr( "Point" ) ); + GroupDest2->setTitle( QString::null ); + GroupDest3->setTitle( QString::null ); + GroupButtons->setTitle( QString::null ); + buttonEnd->setText( tr( "End Sketch" ) ); + buttonClose->setText( tr( "Close Sketch" ) ); + buttonCancel->setText( tr( "&Cancel" ) ); + buttonHelp->setText( tr( "&Help" ) ); +} + diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.h b/src/EntityGUI/EntityGUI_Skeleton_QTD.h index 52a3865f4..70468d719 100644 --- a/src/EntityGUI/EntityGUI_Skeleton_QTD.h +++ b/src/EntityGUI/EntityGUI_Skeleton_QTD.h @@ -1,30 +1,31 @@ // Copyright (C) 2005 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 +// 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 +// +// 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 +// 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'EntityGUI_Skeleton_QTD.ui' ** -** Created: ven déc 12 11:17:07 2003 -** by: The User Interface Compiler (uic) +** Created: Fri Mar 17 15:47:13 2006 +** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! ****************************************************************************/ + #ifndef ENTITYGUI_SKELETON_QTD_H #define ENTITYGUI_SKELETON_QTD_H @@ -32,16 +33,18 @@ #include #include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QButtonGroup; + +class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; +class QSpacerItem; class QGroupBox; -class QPushButton; +class QButtonGroup; class QRadioButton; +class QPushButton; class GEOM_ENTITYGUI_EXPORT EntityGUI_Skeleton_QTD : public QDialog -{ +{ Q_OBJECT public: @@ -62,7 +65,7 @@ public: QPushButton* buttonEnd; QPushButton* buttonClose; QPushButton* buttonCancel; - + QPushButton* buttonHelp; protected: QGridLayout* EntityGUI_Skeleton_QTDLayout; @@ -77,6 +80,11 @@ protected: QGridLayout* GroupDest3Layout; QHBoxLayout* GroupButtonsLayout; QHBoxLayout* Layout3; + QSpacerItem* Spacer1; + +protected slots: + virtual void languageChange(); + }; #endif // ENTITYGUI_SKELETON_QTD_H diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx index 0e6a141d5..aaa7a3eca 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx +++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -29,12 +29,14 @@ #include "EntityGUI_SketcherDlg.h" #include "Sketcher_Profile.hxx" #include "GEOM_Displayer.h" +#include "GEOMBase.h" #include "SUIT_Desktop.h" #include "SUIT_Session.h" #include "SUIT_MessageBox.h" #include "SUIT_ResourceMgr.h" #include "SalomeApp_Application.h" +#include "LightApp_Application.h" #include "LightApp_SelectionMgr.h" #include @@ -61,8 +63,11 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :EntityGUI_Skeleton_QTD(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), myIsAllAdded( false ), +EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :EntityGUI_Skeleton_QTD(parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), + myIsAllAdded( false ), GEOMBase_Helper( dynamic_cast( parent ) ), myGeometryGUI( GUI ) { @@ -73,6 +78,7 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, buttonCancel->setText(tr("GEOM_BUT_CANCEL")); buttonEnd->setText(tr("GEOM_BUT_END_SKETCH")); buttonClose->setText(tr("GEOM_BUT_CLOSE_SKETCH")); + buttonHelp->setText(tr("GEOM_BUT_HELP")); GroupVal->close(TRUE); GroupDest2->close(TRUE); @@ -160,6 +166,7 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, connect(buttonEnd, SIGNAL(clicked()), this, SLOT(ClickOnEnd())); connect(buttonClose, SIGNAL(clicked()), this, SLOT(ClickOnEnd())); connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); + connect(buttonHelp, SIGNAL( clicked() ), this, SLOT( ClickOnHelp())); connect(Group1Sel->buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); connect(Group1Sel->buttonUndo, SIGNAL(clicked()), this, SLOT(ClickOnUndo())); @@ -210,7 +217,7 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent, connect(myGeometryGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); connect(myGeometryGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - + Init(); } @@ -244,6 +251,8 @@ void EntityGUI_SketcherDlg::Init() myLastX2 = 0.0; myLastY2 = 0.0; + myHelpFileName = "sketcher.htm"; + /* Get setting of step value from file configuration */ double step = SUIT_Session::session()->resourceMgr()->doubleValue( "Geometry", "SettingsGeomStep", 100.0 ); @@ -671,6 +680,8 @@ void EntityGUI_SketcherDlg::ClickOnEnd() //================================================================================= bool EntityGUI_SketcherDlg::ClickOnApply() { + ((QPushButton*)sender())->setFocus(); + myCommand.append( GetNewCommand() ); mySketchState = NEXT_POINT; @@ -687,6 +698,23 @@ bool EntityGUI_SketcherDlg::ClickOnApply() return true; } +//================================================================================= +// function : ClickOnHelp() +// purpose : +//================================================================================= +void EntityGUI_SketcherDlg::ClickOnHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) + app->onHelpContextModule(myGeometryGUI ? app->moduleName(myGeometryGUI->moduleName()) : QString(""), myHelpFileName); + else { + SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(myHelpFileName), + QObject::tr("BUT_OK")); + } +} + //================================================================================= // function : ClickOnUndo() // purpose : @@ -1403,4 +1431,3 @@ bool EntityGUI_SketcherDlg::createShapes( GEOM::GEOM_Object_ptr theObject, - diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.h b/src/EntityGUI/EntityGUI_SketcherDlg.h index 4a5c04b3a..b79bcc1e4 100644 --- a/src/EntityGUI/EntityGUI_SketcherDlg.h +++ b/src/EntityGUI/EntityGUI_SketcherDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : EntityGUI_SketcherDlg.h // Author : Damine COQUERET // Module : GEOM -// $Header: #ifndef ENTITYGUI_SKETCHERDLG_H #define ENTITYGUI_SKETCHERDLG_H @@ -65,7 +64,8 @@ class GEOM_ENTITYGUI_EXPORT EntityGUI_SketcherDlg : public EntityGUI_Skeleton_QT Q_OBJECT public: - EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~EntityGUI_SketcherDlg(); protected: @@ -91,9 +91,9 @@ private : int mySketchState; bool myIsAllAdded; - + QLineEdit* myEditCurrentArgument; /* Current LineEdit */ - + QStringList myCommand; QStringList myUndoCommand; @@ -114,6 +114,8 @@ private : GeometryGUI* myGeometryGUI; + QString myHelpFileName; + enum SketchState {FIRST_POINT, NEXT_POINT}; enum SketchType {PT_ABS, PT_RELATIVE, PT_SEL, @@ -131,12 +133,14 @@ private : bool createShapes( GEOM::GEOM_Object_ptr theObject, TopoDS_Shape& theApplyedWire, TopoDS_Shape& theLastSegment ); + private slots: void ClickOnEnd(); void ClickOnCancel(); bool ClickOnApply(); void ClickOnUndo(); void ClickOnRedo(); + void ClickOnHelp(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); @@ -148,7 +152,6 @@ private slots: void Dir1Clicked(int constructorId); void Dir2Clicked(int constructorId); void ValueChangedInSpinBox(double newValue); - }; #endif // ENTITYGUI_SKETCHERDLG_H diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx index 27c0b6c87..6a3685b66 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.cxx +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -52,8 +52,9 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, fl) +EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, fl) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUBSHAPE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -77,6 +78,8 @@ EntityGUI_SubShapeDlg::EntityGUI_SubShapeDlg(QWidget* parent, const char* name, Layout1->addWidget(GroupPoints, 1, 0); /***************************************************************/ + setHelpFileName("explode.htm"); + Init(); } @@ -118,9 +121,7 @@ void EntityGUI_SubShapeDlg::Init() GroupPoints->CheckButton1->setEnabled(false); /* signals and slots connections */ - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -130,10 +131,10 @@ void EntityGUI_SubShapeDlg::Init() connect(GroupPoints->ComboBox1, SIGNAL(activated(int)), this, SLOT(ComboTextChanged())); connect(GroupPoints->CheckButton1, SIGNAL(stateChanged(int)), this, SLOT(SubShapeToggled())); - + connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; - + updateButtonState(); SelectionIntoArgument(); @@ -205,7 +206,7 @@ void EntityGUI_SubShapeDlg::SelectionIntoArgument() return; } - if ( !myGeomBase->GetTopoFromSelection( selectedIO(), S ) || + if ( !GEOMBase::GetTopoFromSelection( selectedIO(), S ) || S.IsNull() || S.ShapeType() == TopAbs_VERTEX ) { @@ -326,7 +327,7 @@ void EntityGUI_SubShapeDlg::LineEditReturnPressed() //================================================================================= void EntityGUI_SubShapeDlg::DeactivateActiveDialog() { - if(GroupConstructors->isEnabled()) { + if (GroupConstructors->isEnabled()) { GEOMBase_Skeleton::DeactivateActiveDialog(); } } @@ -352,9 +353,8 @@ void EntityGUI_SubShapeDlg::ActivateThisDialog() //================================================================================= void EntityGUI_SubShapeDlg::enterEvent(QEvent* e) { - if(GroupConstructors->isEnabled()) - return; - ActivateThisDialog(); + if (!GroupConstructors->isEnabled()) + ActivateThisDialog(); } //================================================================================= diff --git a/src/EntityGUI/EntityGUI_SubShapeDlg.h b/src/EntityGUI/EntityGUI_SubShapeDlg.h index b04ebbaa2..5d70497e9 100644 --- a/src/EntityGUI/EntityGUI_SubShapeDlg.h +++ b/src/EntityGUI/EntityGUI_SubShapeDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : EntityGUI_SubShapeDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_SUBSHAPE_H #define DIALOGBOX_SUBSHAPE_H @@ -44,11 +43,9 @@ class GEOM_ENTITYGUI_EXPORT EntityGUI_SubShapeDlg : public GEOMBase_Skeleton Q_OBJECT public: - EntityGUI_SubShapeDlg( QWidget* parent = 0, - const char* name = 0, - bool modal = FALSE, - WFlags fl = 0 ); - ~EntityGUI_SubShapeDlg(); + EntityGUI_SubShapeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); + ~EntityGUI_SubShapeDlg(); protected: // redefined from GEOMBase_Helper diff --git a/src/EntityGUI/Makefile.in b/src/EntityGUI/Makefile.in index afe156786..cb3127981 100644 --- a/src/EntityGUI/Makefile.in +++ b/src/EntityGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -80,8 +80,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMSketcher -lGEOMBase -lGEOM diff --git a/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui index 1a27ca107..c257a8086 100644 --- a/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui +++ b/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui @@ -358,6 +358,14 @@ &Cancel + + + buttonHelp + + + &Help + + diff --git a/src/EntityGUI/UIFiles/ui_to_cxx b/src/EntityGUI/UIFiles/ui_to_cxx index a430c4c4b..13bc0ac3d 100755 --- a/src/EntityGUI/UIFiles/ui_to_cxx +++ b/src/EntityGUI/UIFiles/ui_to_cxx @@ -1,22 +1,22 @@ -// Copyright (C) 2005 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.salome-platform.org/ -// +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# #!/bin/sh uic -o EntityGUI_Skeleton_QTD.h EntityGUI_Skeleton_QTD.ui diff --git a/src/GEOM/GEOM_Application.cxx b/src/GEOM/GEOM_Application.cxx index 3e8c0b222..6ecba8d6b 100644 --- a/src/GEOM/GEOM_Application.cxx +++ b/src/GEOM/GEOM_Application.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM/GEOM_Application.hxx b/src/GEOM/GEOM_Application.hxx index be419c3c2..b6aef4b28 100644 --- a/src/GEOM/GEOM_Application.hxx +++ b/src/GEOM/GEOM_Application.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOM_Application.hxx // Module : GEOM diff --git a/src/GEOM/GEOM_Application.ixx b/src/GEOM/GEOM_Application.ixx index 557602753..5f26e54c6 100644 --- a/src/GEOM/GEOM_Application.ixx +++ b/src/GEOM/GEOM_Application.ixx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOM_Application.ixx // Module : GEOM diff --git a/src/GEOM/GEOM_Application.jxx b/src/GEOM/GEOM_Application.jxx index c7d06c2ef..9056b0445 100644 --- a/src/GEOM/GEOM_Application.jxx +++ b/src/GEOM/GEOM_Application.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOM_Application.jxx // Module : GEOM diff --git a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx index b0d7ed87e..54b02b9fe 100644 --- a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx +++ b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_HeaderFile diff --git a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx index c27bdb66c..18ec2e283 100644 --- a/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx +++ b/src/GEOM/GEOM_DataMapIteratorOfDataMapOfAsciiStringTransient_0.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx index 164c30048..3fd6bb480 100644 --- a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx +++ b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile diff --git a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx index 4494e4121..18471f8b5 100644 --- a/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx +++ b/src/GEOM/GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_0.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx index 007e0c365..0abffeee0 100644 --- a/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx +++ b/src/GEOM/GEOM_DataMapOfAsciiStringTransient.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_DataMapOfAsciiStringTransient_HeaderFile diff --git a/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx b/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx index 3512cdda9..11ecc03f5 100644 --- a/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx +++ b/src/GEOM/GEOM_DataMapOfAsciiStringTransient_0.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM/GEOM_Engine.cxx b/src/GEOM/GEOM_Engine.cxx index c6ca2f493..8caa47da0 100644 --- a/src/GEOM/GEOM_Engine.cxx +++ b/src/GEOM/GEOM_Engine.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WNT #pragma warning( disable:4786 ) @@ -474,7 +474,7 @@ TCollection_AsciiString GEOM_Engine::DumpPython(int theDocID, } //Add final part of the script - if(aSeq->Value(aLen) < aScriptLength) anUpdatedScript += aScript.SubString(aSeq->Value(aLen)+1, aScriptLength); + if(aLen && aSeq->Value(aLen) < aScriptLength) anUpdatedScript += aScript.SubString(aSeq->Value(aLen)+1, aScriptLength); // mkr : IPAL11865 // Make script to publish in study if ( isPublished ) diff --git a/src/GEOM/GEOM_Engine.hxx b/src/GEOM/GEOM_Engine.hxx index c9cd626b9..662bd242f 100644 --- a/src/GEOM/GEOM_Engine.hxx +++ b/src/GEOM/GEOM_Engine.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_Engine_HXX_ diff --git a/src/GEOM/GEOM_Function.cxx b/src/GEOM/GEOM_Function.cxx index 6069db298..d79dd01a3 100644 --- a/src/GEOM/GEOM_Function.cxx +++ b/src/GEOM/GEOM_Function.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM/GEOM_Function.hxx b/src/GEOM/GEOM_Function.hxx index 4eb5b760e..734dd833d 100644 --- a/src/GEOM/GEOM_Function.hxx +++ b/src/GEOM/GEOM_Function.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_Function_HeaderFile diff --git a/src/GEOM/GEOM_Gen_i.cc b/src/GEOM/GEOM_Gen_i.cc index 1175cafe8..5bdc06417 100644 --- a/src/GEOM/GEOM_Gen_i.cc +++ b/src/GEOM/GEOM_Gen_i.cc @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOM/GEOM_IOperations.cxx b/src/GEOM/GEOM_IOperations.cxx index f922ee164..0e4a71296 100644 --- a/src/GEOM/GEOM_IOperations.cxx +++ b/src/GEOM/GEOM_IOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM/GEOM_IOperations.hxx b/src/GEOM/GEOM_IOperations.hxx index 5a14ae83a..2544b1e1a 100644 --- a/src/GEOM/GEOM_IOperations.hxx +++ b/src/GEOM/GEOM_IOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IOperations_HXX_ diff --git a/src/GEOM/GEOM_ISubShape.hxx b/src/GEOM/GEOM_ISubShape.hxx index 76113bb7b..8b3f1430b 100644 --- a/src/GEOM/GEOM_ISubShape.hxx +++ b/src/GEOM/GEOM_ISubShape.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // NOTE: This is an intreface to a function for the Shapes // (Wire, Face, Shell, Solid and Compound) creation. diff --git a/src/GEOM/GEOM_Object.cxx b/src/GEOM/GEOM_Object.cxx index f386840bb..e36ddc909 100644 --- a/src/GEOM/GEOM_Object.cxx +++ b/src/GEOM/GEOM_Object.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -259,7 +259,7 @@ TCollection_AsciiString GEOM_Object::GetAuxData() bool GEOM_Object::IsMainShape() { Handle(GEOM_Function) aFunction = GetFunction(1); - if(aFunction == NULL || aFunction->GetDriverGUID() != GetSubShapeID()) return true; + if(aFunction.IsNull() || aFunction->GetDriverGUID() != GetSubShapeID()) return true; // mkr : IPAL9921 return false; } diff --git a/src/GEOM/GEOM_Object.hxx b/src/GEOM/GEOM_Object.hxx index b512abfe9..414c61af2 100644 --- a/src/GEOM/GEOM_Object.hxx +++ b/src/GEOM/GEOM_Object.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_Object_HeaderFile #define _GEOM_Object_HeaderFile diff --git a/src/GEOM/GEOM_PythonDump.cxx b/src/GEOM/GEOM_PythonDump.cxx index 86c576c64..d11673b2e 100644 --- a/src/GEOM/GEOM_PythonDump.cxx +++ b/src/GEOM/GEOM_PythonDump.cxx @@ -15,12 +15,17 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "GEOM_PythonDump.hxx" #include +#include + +#include +#include + namespace GEOM { size_t TPythonDump::myCounter = 0; @@ -89,6 +94,14 @@ namespace GEOM return *this; } + TPythonDump& TPythonDump::operator<< (const TopAbs_ShapeEnum theArg) + { + myStream<<"geompy.ShapeType[\""; + TopAbs::Print(theArg, myStream); + myStream<<"\"]"; + return *this; + } + TPythonDump& TPythonDump::operator<< (const Handle(GEOM_Object)& theObject) { TCollection_AsciiString anEntry; @@ -96,4 +109,40 @@ namespace GEOM myStream << anEntry.ToCString(); return *this; } + + Handle(GEOM_Object) GetCreatedLast(const Handle(GEOM_Object)& theObj1, + const Handle(GEOM_Object)& theObj2) + { + if (theObj1.IsNull()) return theObj2; + if (theObj2.IsNull()) return theObj1; + + TColStd_ListOfInteger aTags1, aTags2; + TDF_Tool::TagList(theObj1->GetEntry(), aTags1); + TDF_Tool::TagList(theObj2->GetEntry(), aTags2); + TColStd_ListIteratorOfListOfInteger aListIter1(aTags1), aListIter2(aTags2); + for (; aListIter1.More(); aListIter1.Next()) { + if (!aListIter2.More()) + return theObj1; // anObj1 is stored under anObj2 + + if (aListIter1.Value() > aListIter2.Value()) + return theObj1; + else if (aListIter1.Value() < aListIter2.Value()) + return theObj2; + } + return theObj1; + } + + Handle(GEOM_Object) GetCreatedLast(const Handle(TColStd_HSequenceOfTransient)& theObjects) + { + Handle(GEOM_Object) anObject, aLatest; + int i, aLen = theObjects->Length(); + if (aLen < 1) + return aLatest; + + for (i = 1; i <= aLen; i++) { + anObject = Handle(GEOM_Object)::DownCast(theObjects->Value(i)); + aLatest = GetCreatedLast(aLatest, anObject); + } + return aLatest; + } } diff --git a/src/GEOM/GEOM_PythonDump.hxx b/src/GEOM/GEOM_PythonDump.hxx index 0288f4b1a..4e87df150 100644 --- a/src/GEOM/GEOM_PythonDump.hxx +++ b/src/GEOM/GEOM_PythonDump.hxx @@ -15,7 +15,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOM_PYTHONDUMP_HXX_ #define _GEOM_PYTHONDUMP_HXX_ @@ -49,8 +49,18 @@ namespace GEOM Standard_EXPORT TPythonDump& operator<< (float theArg); Standard_EXPORT TPythonDump& operator<< (const void* theArg); Standard_EXPORT TPythonDump& operator<< (const char* theArg); + Standard_EXPORT TPythonDump& operator<< (const TopAbs_ShapeEnum theArg); Standard_EXPORT TPythonDump& operator<< (const Handle(GEOM_Object)& theObject); }; + + /*! Returns an object from two given, which has the latest entry + */ + Standard_EXPORT Handle(GEOM_Object) GetCreatedLast (const Handle(GEOM_Object)& theObj1, + const Handle(GEOM_Object)& theObj2); + + /*! Returns an object from \a theObjects, which has the latest entry + */ + Standard_EXPORT Handle(GEOM_Object) GetCreatedLast (const Handle(TColStd_HSequenceOfTransient)& theObjects); } #endif diff --git a/src/GEOM/GEOM_Solver.cxx b/src/GEOM/GEOM_Solver.cxx index 6b680f8cd..0414a123b 100644 --- a/src/GEOM/GEOM_Solver.cxx +++ b/src/GEOM/GEOM_Solver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_Solver.hxx" diff --git a/src/GEOM/GEOM_Solver.hxx b/src/GEOM/GEOM_Solver.hxx index e0ea881f8..03dc0c5d2 100644 --- a/src/GEOM/GEOM_Solver.hxx +++ b/src/GEOM/GEOM_Solver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_Solver_HXX_ diff --git a/src/GEOM/GEOM_SubShapeDriver.cxx b/src/GEOM/GEOM_SubShapeDriver.cxx index f33df3046..b756d570e 100644 --- a/src/GEOM/GEOM_SubShapeDriver.cxx +++ b/src/GEOM/GEOM_SubShapeDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM/GEOM_SubShapeDriver.hxx b/src/GEOM/GEOM_SubShapeDriver.hxx index a32a96cdd..bfe80e847 100644 --- a/src/GEOM/GEOM_SubShapeDriver.hxx +++ b/src/GEOM/GEOM_SubShapeDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_ShapeDriver.ixx // Module : GEOM diff --git a/src/GEOM/Handle_GEOM_Application.hxx b/src/GEOM/Handle_GEOM_Application.hxx index 520dc194a..f8e3b285d 100644 --- a/src/GEOM/Handle_GEOM_Application.hxx +++ b/src/GEOM/Handle_GEOM_Application.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : Handle_GEOM_Application.hxx // Module : GEOM diff --git a/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx b/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx index f93d44766..f0800cdff 100644 --- a/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx +++ b/src/GEOM/Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx @@ -1,23 +1,24 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// File : Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx +// Module : GEOM #ifndef _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile #define _Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient_HeaderFile diff --git a/src/GEOM/Makefile.in b/src/GEOM/Makefile.in index ca263cd97..491916459 100644 --- a/src/GEOM/Makefile.in +++ b/src/GEOM/Makefile.in @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# top_srcdir=@top_srcdir@ top_builddir=../.. @@ -45,9 +64,9 @@ EXPORT_HEADERS= GEOM_Application.hxx \ Handle_GEOM_DataMapNodeOfDataMapOfAsciiStringTransient.hxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome $(CAS_OCAF) $(CAS_OCAFVIS) +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_OCAF) $(CAS_OCAFVIS) # additional file to be cleaned diff --git a/src/GEOM/geom.cxx b/src/GEOM/geom.cxx index 2c8385212..8ac0deb96 100644 --- a/src/GEOM/geom.cxx +++ b/src/GEOM/geom.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMAlgo/BlockFix.cdl b/src/GEOMAlgo/BlockFix.cdl index 3fab40f93..7825011c6 100644 --- a/src/GEOMAlgo/BlockFix.cdl +++ b/src/GEOMAlgo/BlockFix.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: BlockFix.cdl -- Created: Tue Dec 7 11:59:05 2004 diff --git a/src/GEOMAlgo/BlockFix.cxx b/src/GEOMAlgo/BlockFix.cxx index 11c973a18..eacbd4027 100644 --- a/src/GEOMAlgo/BlockFix.cxx +++ b/src/GEOMAlgo/BlockFix.cxx @@ -15,12 +15,11 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BlockFix.cxx // Created: Tue Dec 7 11:59:05 2004 // Author: Pavel DURANDIN -// Copyright: Open CASCADE SA 2004 #include diff --git a/src/GEOMAlgo/BlockFix.hxx b/src/GEOMAlgo/BlockFix.hxx index c85590ef6..a6007a7dd 100644 --- a/src/GEOMAlgo/BlockFix.hxx +++ b/src/GEOMAlgo/BlockFix.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _BlockFix_HeaderFile #define _BlockFix_HeaderFile diff --git a/src/GEOMAlgo/BlockFix.ixx b/src/GEOMAlgo/BlockFix.ixx index ad18c4bfa..9912dd405 100644 --- a/src/GEOMAlgo/BlockFix.ixx +++ b/src/GEOMAlgo/BlockFix.ixx @@ -1,23 +1,22 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. #include diff --git a/src/GEOMAlgo/BlockFix.jxx b/src/GEOMAlgo/BlockFix.jxx index 16e91bb0d..552f48067 100644 --- a/src/GEOMAlgo/BlockFix.jxx +++ b/src/GEOMAlgo/BlockFix.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.cdl b/src/GEOMAlgo/BlockFix_BlockFixAPI.cdl index fc1e28f62..7b415e7cb 100644 --- a/src/GEOMAlgo/BlockFix_BlockFixAPI.cdl +++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: BlockFix_BlockFixAPI.cdl -- Created: Tue Dec 7 17:56:09 2004 diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx index 41677111c..c87b2e60d 100644 --- a/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx +++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BlockFix_BlockFixAPI.cxx // Created: Tue Dec 7 11:59:05 2004 diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx index 9eb2198db..fd699a0de 100644 --- a/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx +++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _BlockFix_BlockFixAPI_HeaderFile #define _BlockFix_BlockFixAPI_HeaderFile diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx b/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx index 4fc77f490..d70496dc0 100644 --- a/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx +++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx index b1415ecd4..7e28c943d 100644 --- a/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx +++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _ShapeBuild_ReShape_HeaderFile #include diff --git a/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx b/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx index 77841f932..7926785d8 100644 --- a/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx +++ b/src/GEOMAlgo/BlockFix_BlockFixAPI.lxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMAlgo/BlockFix_CheckTool.cdl b/src/GEOMAlgo/BlockFix_CheckTool.cdl index b4875d806..aa85c32e8 100644 --- a/src/GEOMAlgo/BlockFix_CheckTool.cdl +++ b/src/GEOMAlgo/BlockFix_CheckTool.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: BlockFix_CheckTool.cdl -- Created: Fri Dec 17 10:36:58 2004 diff --git a/src/GEOMAlgo/BlockFix_CheckTool.cxx b/src/GEOMAlgo/BlockFix_CheckTool.cxx index 6348ffc07..94269ef75 100644 --- a/src/GEOMAlgo/BlockFix_CheckTool.cxx +++ b/src/GEOMAlgo/BlockFix_CheckTool.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BlockFix_CheckTool.cxx // Created: 17.12.04 11:15:25 diff --git a/src/GEOMAlgo/BlockFix_CheckTool.hxx b/src/GEOMAlgo/BlockFix_CheckTool.hxx index bfb538bab..605174576 100644 --- a/src/GEOMAlgo/BlockFix_CheckTool.hxx +++ b/src/GEOMAlgo/BlockFix_CheckTool.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _BlockFix_CheckTool_HeaderFile #define _BlockFix_CheckTool_HeaderFile diff --git a/src/GEOMAlgo/BlockFix_CheckTool.ixx b/src/GEOMAlgo/BlockFix_CheckTool.ixx index 1b3f08c4b..c7e4949ab 100644 --- a/src/GEOMAlgo/BlockFix_CheckTool.ixx +++ b/src/GEOMAlgo/BlockFix_CheckTool.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/BlockFix_CheckTool.jxx b/src/GEOMAlgo/BlockFix_CheckTool.jxx index 80b5457e9..b9ba94f32 100644 --- a/src/GEOMAlgo/BlockFix_CheckTool.jxx +++ b/src/GEOMAlgo/BlockFix_CheckTool.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cdl b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cdl index fa29a304b..23551c0cb 100644 --- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cdl +++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: BlockFix_PeriodicSurfaceModifier.cdl -- Created: Wed Dec 15 10:03:50 2004 diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cxx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cxx index 34a5922e6..97590046a 100644 --- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cxx +++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BlockFix_PeriodicSurfaceModifier.cxx // Created: 15.12.04 10:08:50 diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx index b55096ce9..1230e3e6f 100644 --- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx +++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _BlockFix_PeriodicSurfaceModifier_HeaderFile #define _BlockFix_PeriodicSurfaceModifier_HeaderFile diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx index 7bdcfb449..49daa3c1f 100644 --- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx +++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx index ccb0e4740..b30f00602 100644 --- a/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx +++ b/src/GEOMAlgo/BlockFix_PeriodicSurfaceModifier.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Face_HeaderFile #include diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl index e5cf149f2..b67d9d569 100644 --- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl +++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: BlockFix_SphereSpaceModifier.cdl -- Created: Tue Dec 7 12:01:49 2004 diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx index e80417110..e61b4a53b 100644 --- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx +++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BlockFix.cxx // Created: Tue Dec 7 11:59:05 2004 diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx index 463277a46..80a600920 100644 --- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx +++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _BlockFix_SphereSpaceModifier_HeaderFile #define _BlockFix_SphereSpaceModifier_HeaderFile diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx index 55b027172..651423466 100644 --- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx +++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx index 273db978d..61deba225 100644 --- a/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx +++ b/src/GEOMAlgo/BlockFix_SphereSpaceModifier.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Face_HeaderFile #include diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.cdl b/src/GEOMAlgo/BlockFix_UnionEdges.cdl index 04fdd3d21..ff806baf6 100644 --- a/src/GEOMAlgo/BlockFix_UnionEdges.cdl +++ b/src/GEOMAlgo/BlockFix_UnionEdges.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: BlockFix_UnionEdges.cdl -- Created: Tue Dec 7 15:24:51 2004 diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.cxx b/src/GEOMAlgo/BlockFix_UnionEdges.cxx index a7ad222a0..667375123 100644 --- a/src/GEOMAlgo/BlockFix_UnionEdges.cxx +++ b/src/GEOMAlgo/BlockFix_UnionEdges.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BlockFix_UnionEdges.cxx // Created: 07.12.04 15:27:30 diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.hxx b/src/GEOMAlgo/BlockFix_UnionEdges.hxx index 3b8aa2102..0f5baf48e 100644 --- a/src/GEOMAlgo/BlockFix_UnionEdges.hxx +++ b/src/GEOMAlgo/BlockFix_UnionEdges.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _BlockFix_UnionEdges_HeaderFile #define _BlockFix_UnionEdges_HeaderFile diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.ixx b/src/GEOMAlgo/BlockFix_UnionEdges.ixx index addb6a314..ffbdfbc39 100644 --- a/src/GEOMAlgo/BlockFix_UnionEdges.ixx +++ b/src/GEOMAlgo/BlockFix_UnionEdges.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/BlockFix_UnionEdges.jxx b/src/GEOMAlgo/BlockFix_UnionEdges.jxx index 073b6d865..bb3b12f68 100644 --- a/src/GEOMAlgo/BlockFix_UnionEdges.jxx +++ b/src/GEOMAlgo/BlockFix_UnionEdges.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _ShapeBuild_ReShape_HeaderFile #include diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.cdl b/src/GEOMAlgo/BlockFix_UnionFaces.cdl index 8ed27cdae..2251c6b45 100644 --- a/src/GEOMAlgo/BlockFix_UnionFaces.cdl +++ b/src/GEOMAlgo/BlockFix_UnionFaces.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: BlockFix_UnionFaces.cdl -- Created: Tue Dec 7 17:15:42 2004 diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.cxx b/src/GEOMAlgo/BlockFix_UnionFaces.cxx index 3f6c5220b..ee4398aeb 100644 --- a/src/GEOMAlgo/BlockFix_UnionFaces.cxx +++ b/src/GEOMAlgo/BlockFix_UnionFaces.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BlockFix_UnionFaces.cxx // Created: Tue Dec 7 17:15:42 2004 diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.hxx b/src/GEOMAlgo/BlockFix_UnionFaces.hxx index a67693762..2618008b0 100644 --- a/src/GEOMAlgo/BlockFix_UnionFaces.hxx +++ b/src/GEOMAlgo/BlockFix_UnionFaces.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _BlockFix_UnionFaces_HeaderFile #define _BlockFix_UnionFaces_HeaderFile diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.ixx b/src/GEOMAlgo/BlockFix_UnionFaces.ixx index bae71ca14..eda22330b 100644 --- a/src/GEOMAlgo/BlockFix_UnionFaces.ixx +++ b/src/GEOMAlgo/BlockFix_UnionFaces.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/BlockFix_UnionFaces.jxx b/src/GEOMAlgo/BlockFix_UnionFaces.jxx index d8f13abda..1a919c24a 100644 --- a/src/GEOMAlgo/BlockFix_UnionFaces.jxx +++ b/src/GEOMAlgo/BlockFix_UnionFaces.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo.cdl b/src/GEOMAlgo/GEOMAlgo.cdl index 40a2084be..c5c09eb5a 100755 --- a/src/GEOMAlgo/GEOMAlgo.cdl +++ b/src/GEOMAlgo/GEOMAlgo.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo.cdl -- Created: Sat Dec 04 12:36:22 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.cdl b/src/GEOMAlgo/GEOMAlgo_Algo.cdl index d8cd5b175..a0482b714 100755 --- a/src/GEOMAlgo/GEOMAlgo_Algo.cdl +++ b/src/GEOMAlgo/GEOMAlgo_Algo.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_Algo.cdl -- Created: Sat Dec 04 12:37:56 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.cxx b/src/GEOMAlgo/GEOMAlgo_Algo.cxx index 8f4aecacb..221cf1de7 100755 --- a/src/GEOMAlgo/GEOMAlgo_Algo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Algo.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_Algo.cxx // Created: Sat Dec 04 12:39:47 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.hxx b/src/GEOMAlgo/GEOMAlgo_Algo.hxx index aeb974338..bfeae4fa2 100644 --- a/src/GEOMAlgo/GEOMAlgo_Algo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Algo.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_Algo_HeaderFile #define _GEOMAlgo_Algo_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.ixx b/src/GEOMAlgo/GEOMAlgo_Algo.ixx index ae1ccb962..b31871134 100644 --- a/src/GEOMAlgo/GEOMAlgo_Algo.ixx +++ b/src/GEOMAlgo/GEOMAlgo_Algo.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_Algo.jxx b/src/GEOMAlgo/GEOMAlgo_Algo.jxx index 58dc7b7aa..edeaf138e 100644 --- a/src/GEOMAlgo/GEOMAlgo_Algo.jxx +++ b/src/GEOMAlgo/GEOMAlgo_Algo.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMAlgo_Algo_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl index d607e55c4..4cabe930d 100644 --- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl +++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_CoupleOfShapes.cdl -- Created: Wed Dec 15 13:00:10 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx index 20b103c7d..cdc6bbbd7 100644 --- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx +++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_CoupleOfShapes.cxx // Created: Wed Dec 15 13:03:52 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx index 26889be5e..289489482 100644 --- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx +++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_CoupleOfShapes_HeaderFile #define _GEOMAlgo_CoupleOfShapes_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx index 1e5d2f760..39c41d630 100644 --- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx +++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx index 9b4972d64..bae26f1de 100644 --- a/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx +++ b/src/GEOMAlgo/GEOMAlgo_CoupleOfShapes.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx index 292bb3afb..431229248 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile #define _GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx index 53a99babb..2c786bb3b 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapIteratorOfDataMapOfPassKeyInteger_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx index 7226f82be..e57928773 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile #define _GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx index 6035a471a..8d06859ec 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx index 746ac5413..60cb6712a 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile #define _GEOMAlgo_DataMapOfPassKeyInteger_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger_0.cxx b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger_0.cxx index 0163b4e1a..8cd1a4f52 100644 --- a/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_DataMapOfPassKeyInteger_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl index 7dff18472..b5c0a5d36 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_FinderShapeOn.cdl -- Created: Tue Jan 11 14:35:52 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx index 50e94384a..c3a5b7cfc 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_FinderShapeOn.cxx // Created: Tue Jan 11 14:44:31 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx index 42129bc28..5d9cfe4d8 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_FinderShapeOn_HeaderFile #define _GEOMAlgo_FinderShapeOn_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx index 00afa2d33..37310e691 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx index 99b4e86f3..a0204f414 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _Geom_Surface_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl index 46ee5fad9..0629101be 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_FinderShapeOn1.cdl -- Created: Fri Mar 4 10:26:54 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx index c58cccefb..6a8f33bb4 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_FinderShapeOn1.cxx // Created: Fri Mar 4 10:31:06 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx index 7d0c6f819..267f191e1 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_FinderShapeOn1_HeaderFile #define _GEOMAlgo_FinderShapeOn1_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx index 6c8932859..a0f3b96d8 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx index f04afdb05..93dc321dc 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOn1.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _Geom_Surface_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx index 9b1b67fda..c6d98798b 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.cxx @@ -15,7 +15,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx index d3fbbe30b..fe9ed8e66 100644 --- a/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx +++ b/src/GEOMAlgo/GEOMAlgo_FinderShapeOnQuad.hxx @@ -15,7 +15,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl index 47c563ffd..569314e4a 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl +++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_GlueAnalyser.cdl -- Created: Wed Dec 15 11:03:03 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx index 39e60a0d2..b8aff7294 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_GlueDetector.cxx // Created: Wed Dec 15 11:08:09 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx index 4262f95b9..e87223a53 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_GlueAnalyser_HeaderFile #define _GEOMAlgo_GlueAnalyser_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx index da6caa203..833d4d8bd 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx +++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx index e1a2e8298..bc6681f5b 100644 --- a/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx +++ b/src/GEOMAlgo/GEOMAlgo_GlueAnalyser.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cdl b/src/GEOMAlgo/GEOMAlgo_Gluer.cdl index aa1be90b4..442f05305 100755 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.cdl +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_Gluer.cdl -- Created: Sat Dec 04 12:41:32 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx index ab898a706..1e6d31e6b 100755 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_Gluer.cxx // Created: Sat Dec 04 12:45:53 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx index f37b8010c..7d9b77348 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_Gluer_HeaderFile #define _GEOMAlgo_Gluer_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.ixx b/src/GEOMAlgo/GEOMAlgo_Gluer.ixx index b7abfc516..b27442421 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.ixx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_Gluer.jxx b/src/GEOMAlgo/GEOMAlgo_Gluer.jxx index cb259d79b..52df5103a 100644 --- a/src/GEOMAlgo/GEOMAlgo_Gluer.jxx +++ b/src/GEOMAlgo/GEOMAlgo_Gluer.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopTools_ListOfShape_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx index 3f620afd0..8f6683ad5 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx index 9c2564b33..84e494ec5 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx index af09ac4f9..cd79d0b02 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx index 97be9daa0..d29cf0f21 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx index 94b521fd1..f8310d70a 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx index be0803d75..f2a471ddb 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx index 2b39ccf3b..084701c5a 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx index 832884d41..16eda4fb5 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx index da467f38b..427dd9533 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile #define _GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx index a29a65763..8bf0d942a 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx index b67dc8c70..d615873d1 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile #define _GEOMAlgo_IndexedDataMapOfIntegerShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx index 173ef57c9..4b63205c8 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfIntegerShape_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx index e89044f20..59bd0bab5 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile #define _GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx index 94bdc322b..a493ac29c 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyListOfShape_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx index 55506997d..a77707d37 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile #define _GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx index 8d5b2b3d9..0fa671f46 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfPassKeyShapeListOfShape_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx index c9df51c94..bd0d1e0ec 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile #define _GEOMAlgo_IndexedDataMapOfShapeBox_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx index a0717bcd5..ed71748a5 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeBox_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx index 35397a9a0..1f15ba495 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile #define _GEOMAlgo_IndexedDataMapOfShapeState_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState_0.cxx b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState_0.cxx index f95fd1c70..0dd967834 100644 --- a/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_IndexedDataMapOfShapeState_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx index 34977eb5e..93a423bbb 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile #define _GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx index ee6cbdb6d..51af2be73 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfCoupleOfShapes_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx index b370cbbd4..ade23aa45 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile #define _GEOMAlgo_ListIteratorOfListOfPnt_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt_0.cxx index bc1684b68..b46afbab3 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ListIteratorOfListOfPnt_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx index ef078a2eb..3addadf19 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile #define _GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx index 78fd962da..65de62b3d 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfCoupleOfShapes_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx index fd9b15d9a..24d004406 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt.hxx @@ -1,24 +1,21 @@ -// File generated by CPPExt (Transient) -// -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, +// CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS // -// This file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_ListNodeOfListOfPnt_HeaderFile #define _GEOMAlgo_ListNodeOfListOfPnt_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt_0.cxx index bb3473704..fb7f104f6 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ListNodeOfListOfPnt_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx index a8bb21f1e..b3325c16b 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile #define _GEOMAlgo_ListOfCoupleOfShapes_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes_0.cxx index 2630fd011..8a77286c7 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ListOfCoupleOfShapes_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx index 270207654..d7958521f 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ListOfPnt.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_ListOfPnt_HeaderFile #define _GEOMAlgo_ListOfPnt_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx b/src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx index 4d8ff2b7d..c663efc01 100644 --- a/src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ListOfPnt_0.cxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.cdl b/src/GEOMAlgo/GEOMAlgo_PassKey.cdl index f400e8638..5644a07ff 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKey.cdl +++ b/src/GEOMAlgo/GEOMAlgo_PassKey.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_PassKey.cdl -- Created: diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.cxx b/src/GEOMAlgo/GEOMAlgo_PassKey.cxx index c072b7027..f38e29f60 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKey.cxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKey.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_PassKey.cxx // Created: diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.hxx b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx index 880fa62a9..54051e170 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKey.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKey.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_PassKey_HeaderFile #define _GEOMAlgo_PassKey_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.ixx b/src/GEOMAlgo/GEOMAlgo_PassKey.ixx index 9e0b612a9..5d1d1e3ca 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKey.ixx +++ b/src/GEOMAlgo/GEOMAlgo_PassKey.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_PassKey.jxx b/src/GEOMAlgo/GEOMAlgo_PassKey.jxx index 182bb6f10..ed5b193d1 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKey.jxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKey.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TColStd_ListOfInteger_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl index 7928f94c2..e16dae0e9 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_PassKeyMapHasher.cdl -- Created: diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx index 6f95f979a..fbd3d81cb 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_PassKeyMapHasher.cxx // Created: diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx index 2a1a4650e..6cf2510ab 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_PassKeyMapHasher_HeaderFile #define _GEOMAlgo_PassKeyMapHasher_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx index c990ee15c..6bb118e58 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx index 15e5c9eaf..5edadebd2 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyMapHasher.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMAlgo_PassKey_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl index 8094fb6c2..523f5898e 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_PassKeyShape.cdl -- Created: diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx index b85dbd00d..cd90291c2 100755 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_PassKeyShape.cxx // Created: diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx index 9bb52df00..0e4d113a3 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_PassKeyShape_HeaderFile #define _GEOMAlgo_PassKeyShape_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx index befc4fd74..2f34c7cf1 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx index a29e7ff8f..ecc2db93f 100644 --- a/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx +++ b/src/GEOMAlgo/GEOMAlgo_PassKeyShape.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl index 0cb903d7d..640176e39 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_ShapeAlgo.cdl -- Created: Tue Dec 7 12:05:19 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx index 201b5cd30..1c25bb27f 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_ShapeAlgo.cxx // Created: Tue Dec 7 12:06:54 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx index a3390875e..27e6afad6 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_ShapeAlgo_HeaderFile #define _GEOMAlgo_ShapeAlgo_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx index 1b153c305..6e2441ab5 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx index e3304cad7..d5c10358d 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeAlgo.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl index 45f86b4d1..caf91063e 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_ShapeSolid.cdl -- Created: Thu Jan 13 12:44:07 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx index 87a0de87c..e22ed2e08 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_ShapeSolid.cxx // Created: Thu Jan 13 12:54:48 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx index 6142c1b72..da207056c 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_ShapeSolid_HeaderFile #define _GEOMAlgo_ShapeSolid_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx index 1ef447531..7e682ae14 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx index 2b5222ad5..76fc8fce0 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx +++ b/src/GEOMAlgo/GEOMAlgo_ShapeSolid.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _BOPTools_DSFiller_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl index 01c1c1c1c..22959a271 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_ShellSolid.cdl -- Created: Wed Jan 12 12:45:20 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx index a92f8a776..f502a8fc2 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_ShellSolid.cxx // Created: Wed Jan 12 12:49:45 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx index 16415ecc7..2eb5a6c59 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_ShellSolid_HeaderFile #define _GEOMAlgo_ShellSolid_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx index f5b12e14e..dcadd3ef6 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx b/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx index 0e6c4944f..79b529b94 100644 --- a/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx +++ b/src/GEOMAlgo/GEOMAlgo_ShellSolid.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMAlgo_ShellSolid_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl index 693d4590e..cf105ffa1 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_SolidSolid.cdl -- Created: Wed Jan 26 12:05:14 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx index c0e99a259..132f7825e 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_SolidSolid.cxx // Created: Wed Jan 26 12:06:26 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx index 5a90d3135..fa1895c7b 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_SolidSolid_HeaderFile #define _GEOMAlgo_SolidSolid_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx index 9db5bd64f..af6eda6ac 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx b/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx index 43dd0d560..f6711df29 100644 --- a/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx +++ b/src/GEOMAlgo/GEOMAlgo_SolidSolid.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_State.hxx b/src/GEOMAlgo/GEOMAlgo_State.hxx index e1a164c9f..8d4707bd4 100644 --- a/src/GEOMAlgo/GEOMAlgo_State.hxx +++ b/src/GEOMAlgo/GEOMAlgo_State.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Enum) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_State_HeaderFile #define _GEOMAlgo_State_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.cdl b/src/GEOMAlgo/GEOMAlgo_StateCollector.cdl index 70065fe5b..a9ae5dcae 100644 --- a/src/GEOMAlgo/GEOMAlgo_StateCollector.cdl +++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_StateCollector.cdl -- Created: Thu Mar 10 09:39:25 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx b/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx index 5281aced7..90da89ff5 100644 --- a/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx +++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_StateCollector.cxx // Created: Thu Mar 10 09:42:11 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx b/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx index 3c1e25bfe..e0c109af2 100644 --- a/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx +++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_StateCollector_HeaderFile #define _GEOMAlgo_StateCollector_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx b/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx index d3cb9c3cf..50d4ab6ee 100644 --- a/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx +++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx b/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx index 40d7d3ab6..585231ea2 100644 --- a/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx +++ b/src/GEOMAlgo/GEOMAlgo_StateCollector.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMAlgo_StateCollector_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl index d812ff075..9035638b5 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_SurfaceTools.cdl -- Created: Thu Jan 27 11:03:49 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx index 436d05f1d..fd2171e63 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_SurfaceTools.cxx // Created: Thu Jan 27 11:05:16 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx index 19f616025..f11a7ce96 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_SurfaceTools_HeaderFile #define _GEOMAlgo_SurfaceTools_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx index 5a0ce4e92..7911ef34c 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx index 34238e42b..a0ed3b986 100644 --- a/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx +++ b/src/GEOMAlgo/GEOMAlgo_SurfaceTools.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _Geom_Surface_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.cdl b/src/GEOMAlgo/GEOMAlgo_Tools.cdl index 4981d93bf..53d3d7cf2 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools.cdl +++ b/src/GEOMAlgo/GEOMAlgo_Tools.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_Tools.cdl -- Created: Mon Dec 6 11:26:02 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.cxx b/src/GEOMAlgo/GEOMAlgo_Tools.cxx index 6f4696463..5e3991bfe 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools.cxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_Tools.cxx // Created: Mon Dec 6 11:35:29 2004 diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.hxx b/src/GEOMAlgo/GEOMAlgo_Tools.hxx index 73d9bc35f..b566f21c0 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools.hxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_Tools_HeaderFile #define _GEOMAlgo_Tools_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.ixx b/src/GEOMAlgo/GEOMAlgo_Tools.ixx index 6b9d6c04d..708109157 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools.ixx +++ b/src/GEOMAlgo/GEOMAlgo_Tools.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_Tools.jxx b/src/GEOMAlgo/GEOMAlgo_Tools.jxx index 51a85dfd9..af7450af9 100644 --- a/src/GEOMAlgo/GEOMAlgo_Tools.jxx +++ b/src/GEOMAlgo/GEOMAlgo_Tools.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl index 588e8d851..a4d9c01d0 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_VertexSolid.cdl -- Created: Wed Jan 12 16:34:53 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx index 349f1498c..716bf0390 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_VertexSolid.cxx // Created: Wed Jan 12 16:36:40 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx index 103c7f2f6..941104ec7 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_VertexSolid_HeaderFile #define _GEOMAlgo_VertexSolid_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx index e2351fef2..335d706b7 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx b/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx index c9137f862..38f0ad644 100644 --- a/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx +++ b/src/GEOMAlgo/GEOMAlgo_VertexSolid.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMAlgo_VertexSolid_HeaderFile #include diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cdl b/src/GEOMAlgo/GEOMAlgo_WireSolid.cdl index f55158a97..a24418a8a 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cdl +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: GEOMAlgo_WireSolid.cdl -- Created: Wed Jan 12 10:17:00 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx index 306fe56be..90b7985c2 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: GEOMAlgo_WireSolid.cxx // Created: Wed Jan 12 10:19:31 2005 diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx index 7212908dc..ef9ec1470 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _GEOMAlgo_WireSolid_HeaderFile #define _GEOMAlgo_WireSolid_HeaderFile diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx b/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx index 37b35b408..ff86f06f7 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.ixx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include diff --git a/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx b/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx index 16961833e..c4d2a32b2 100644 --- a/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx +++ b/src/GEOMAlgo/GEOMAlgo_WireSolid.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMAlgo_WireSolid_HeaderFile #include diff --git a/src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx b/src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx index 1664fde18..12d404dce 100644 --- a/src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx +++ b/src/GEOMAlgo/Handle_BlockFix_BlockFixAPI.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_BlockFix_BlockFixAPI_HeaderFile #define _Handle_BlockFix_BlockFixAPI_HeaderFile diff --git a/src/GEOMAlgo/Handle_BlockFix_PeriodicSurfaceModifier.hxx b/src/GEOMAlgo/Handle_BlockFix_PeriodicSurfaceModifier.hxx index 114b7606a..f0fc8be95 100644 --- a/src/GEOMAlgo/Handle_BlockFix_PeriodicSurfaceModifier.hxx +++ b/src/GEOMAlgo/Handle_BlockFix_PeriodicSurfaceModifier.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_BlockFix_PeriodicSurfaceModifier_HeaderFile #define _Handle_BlockFix_PeriodicSurfaceModifier_HeaderFile diff --git a/src/GEOMAlgo/Handle_BlockFix_SphereSpaceModifier.hxx b/src/GEOMAlgo/Handle_BlockFix_SphereSpaceModifier.hxx index 2541a6ddf..8a84637b7 100644 --- a/src/GEOMAlgo/Handle_BlockFix_SphereSpaceModifier.hxx +++ b/src/GEOMAlgo/Handle_BlockFix_SphereSpaceModifier.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_BlockFix_SphereSpaceModifier_HeaderFile #define _Handle_BlockFix_SphereSpaceModifier_HeaderFile diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx index 9e15b517b..cf0ed1eec 100644 --- a/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx +++ b/src/GEOMAlgo/Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile #define _Handle_GEOMAlgo_DataMapNodeOfDataMapOfPassKeyInteger_HeaderFile diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx index baa1ea423..ba87e481d 100644 --- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx +++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfIntegerShape_HeaderFile diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx index e246513bc..6a5b8a74c 100644 --- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx +++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyListOfShape_HeaderFile diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx index dd43aac0c..82502e38a 100644 --- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx +++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfPassKeyShapeListOfShape_HeaderFile diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx index 17835020d..ef5aae2c2 100644 --- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx +++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeBox_HeaderFile diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx index 2ee27d5e9..3c50ad124 100644 --- a/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx +++ b/src/GEOMAlgo/Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile #define _Handle_GEOMAlgo_IndexedDataMapNodeOfIndexedDataMapOfShapeState_HeaderFile diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx index fc17f9463..072614382 100644 --- a/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx +++ b/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile #define _Handle_GEOMAlgo_ListNodeOfListOfCoupleOfShapes_HeaderFile diff --git a/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx b/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx index d073a4ceb..f773bfd3e 100644 --- a/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx +++ b/src/GEOMAlgo/Handle_GEOMAlgo_ListNodeOfListOfPnt.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Transient) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_GEOMAlgo_ListNodeOfListOfPnt_HeaderFile #define _Handle_GEOMAlgo_ListNodeOfListOfPnt_HeaderFile diff --git a/src/GEOMAlgo/Makefile.in b/src/GEOMAlgo/Makefile.in index d250da21c..a0c7e45a4 100644 --- a/src/GEOMAlgo/Makefile.in +++ b/src/GEOMAlgo/Makefile.in @@ -16,7 +16,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -101,9 +101,9 @@ EXPORT_HEADERS = \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBO $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/GEOMBase/GEOMBase.cxx b/src/GEOMBase/GEOMBase.cxx index 049432031..a716f062a 100644 --- a/src/GEOMBase/GEOMBase.cxx +++ b/src/GEOMBase/GEOMBase.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -89,23 +89,6 @@ using namespace std; #include "SALOMEDSClient.hxx" -//======================================================================= -// function : GEOMBase() -// purpose : Constructor -//======================================================================= -GEOMBase::GEOMBase() -{ -} - - -//======================================================================= -// function : ~GEOMBase() -// purpose : Destructor -//======================================================================= -GEOMBase::~GEOMBase() -{ -} - //===================================================================================== // function : GetShapeFromIOR() // purpose : exist also as static method ! diff --git a/src/GEOMBase/GEOMBase.h b/src/GEOMBase/GEOMBase.h index 36b52c508..ff3feecbb 100644 --- a/src/GEOMBase/GEOMBase.h +++ b/src/GEOMBase/GEOMBase.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : GEOMBase.h // Author : Damien COQUERET // Module : GEOM -// $Header$ #ifndef GEOMBASE_H #define GEOMBASE_H @@ -56,53 +55,45 @@ class QWidget; class GEOMBASE_EXPORT GEOMBase { public : - GEOMBase(); - ~GEOMBase(); - - // SAN -- TO BE REMOVED !!! - static bool Display( GEOM::GEOM_Object_ptr ) {return false;} - static bool AddInStudy( GEOM::GEOM_Object_ptr ) {return false;} - static void DisplaySimulationShape(const TopoDS_Shape& S) {}; - static void EraseSimulationShape() {}; - // SAN -- TO BE REMOVED !!! - /* Selection and objects management */ static int GetIndex(const TopoDS_Shape& subshape, const TopoDS_Shape& shape, int ShapeType); static TopoDS_Shape GetShapeFromIOR(QString IOR); - static bool GetShape( const GEOM::GEOM_Object_ptr&, TopoDS_Shape&, const TopAbs_ShapeEnum = TopAbs_SHAPE ); + static bool GetShape(const GEOM::GEOM_Object_ptr&, TopoDS_Shape&, + const TopAbs_ShapeEnum = TopAbs_SHAPE); static bool GetTopoFromSelection(const SALOME_ListIO& aList, TopoDS_Shape& tds); - static int GetNameOfSelectedIObjects(const SALOME_ListIO& aList, QString& aName, const bool theShapesOnly = false ); + static int GetNameOfSelectedIObjects(const SALOME_ListIO& aList, QString& aName, + const bool theShapesOnly = false); static bool GetShapeTypeString(const TopoDS_Shape& aShape, Standard_CString& aTypeString); /* Convertions */ static GEOM::GEOM_Object_ptr ConvertIOinGEOMShape(const Handle(SALOME_InteractiveObject)& IO, - Standard_Boolean& testResult); + Standard_Boolean& testResult); static Handle(GEOM_AISShape) ConvertIOinGEOMAISShape(const Handle(SALOME_InteractiveObject)& IO, - Standard_Boolean& testResult, - bool onlyInActiveView = false); + Standard_Boolean& testResult, + bool onlyInActiveView = false); - static Handle(AIS_InteractiveObject) GetAIS( const Handle(SALOME_InteractiveObject)& theIO, - const bool isOnlyInActiveView = false ); + static Handle(AIS_InteractiveObject) GetAIS(const Handle(SALOME_InteractiveObject)& theIO, + const bool isOnlyInActiveView = false); static void ConvertListOfIOInListOfIOR(const SALOME_ListIO& aList, - GEOM::string_array& listIOR); + GEOM::string_array& listIOR); static Handle(GEOM_AISShape) ConvertIORinGEOMAISShape(const char * IOR, - Standard_Boolean& testResult, - bool onlyInActiveView = false); + Standard_Boolean& testResult, + bool onlyInActiveView = false); static GEOM_Actor* ConvertIORinGEOMActor(const char * IOR, Standard_Boolean& testResult, - bool onlyInActiveView = false); + bool onlyInActiveView = false); static GEOM::GEOM_Object_ptr ConvertIOinGEOMObject(const Handle(SALOME_InteractiveObject)& IO, - Standard_Boolean& testResult); + Standard_Boolean& testResult); - static void ConvertListOfIOInListOfGO( const SALOME_ListIO& aList, - GEOM::ListOfGO& listGO, - const bool theShapesOnly = false ); + static void ConvertListOfIOInListOfGO(const SALOME_ListIO& aList, + GEOM::ListOfGO& listGO, + const bool theShapesOnly = false); - static GEOM::GEOM_Object_ptr GetObjectFromIOR( const char* theIOR ); + static GEOM::GEOM_Object_ptr GetObjectFromIOR(const char* theIOR); + + static char* GetIORFromObject(const GEOM::GEOM_Object_ptr& theObject); - static char* GetIORFromObject( const GEOM::GEOM_Object_ptr& theObject ); - /* Geometry */ static bool VertexToPoint(const TopoDS_Shape& S, gp_Pnt& P); @@ -112,15 +103,16 @@ public : /* User dialog 1 parameter returned */ static double Parameter(Standard_Boolean& res, - const char* aValue1 = 0, const char* aTitle1 = 0, - const char* aTitle = 0, const double bottom = -1E6, - const double top = +1E6, const int decimals = 6); + const char* aValue1 = 0, const char* aTitle1 = 0, + const char* aTitle = 0, const double bottom = -1E6, + const double top = +1E6, const int decimals = 6); /* Simulation management */ static bool CreateArrowForLinearEdge(const TopoDS_Shape& tds, TopoDS_Shape& ArrowCone); /* Generates default names */ - static bool SelectionByNameInDialogs(QWidget* aWidget, const QString& userObjectName, const SALOME_ListIO& aList); + static bool SelectionByNameInDialogs(QWidget* aWidget, const QString& userObjectName, + const SALOME_ListIO& aList); /* Shows message box with error code */ static bool DefineDlgPosition(QWidget* aDlg, int& x, int& y); @@ -130,10 +122,9 @@ public : static void ShowErrorMessage(const char* theErrorCode, const char* theComment = 0); /* Gets name of object */ - static QString GetName( GEOM::GEOM_Object_ptr ); + static QString GetName(GEOM::GEOM_Object_ptr); - static bool IsShape( GEOM::GEOM_Object_ptr theObj ); + static bool IsShape(GEOM::GEOM_Object_ptr theObj); }; #endif - diff --git a/src/GEOMBase/GEOMBase_Helper.cxx b/src/GEOMBase/GEOMBase_Helper.cxx index f48979a4e..9cd2a40d6 100755 --- a/src/GEOMBase/GEOMBase_Helper.cxx +++ b/src/GEOMBase/GEOMBase_Helper.cxx @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -109,7 +109,8 @@ GEOMBase_Helper::~GEOMBase_Helper() globalSelection( GEOM_ALLOBJECTS, true ); - delete myDisplayer; + if (myDisplayer) + delete myDisplayer; } //================================================================ @@ -758,13 +759,21 @@ bool GEOMBase_Helper::onAccept( const bool publish, const bool useTransaction ) else { const int nbObjs = objects.size(); bool withChildren = false; + int aNumber = 1; for ( ObjectList::iterator it = objects.begin(); it != objects.end(); ++it ) { if ( publish ) { - QString aName(""); - if ( nbObjs > 1 ) - aName = strlen( getNewObjectName() ) ? GEOMBase::GetDefaultName( getNewObjectName() ) : GEOMBase::GetDefaultName( getPrefix( *it ) ); - else { - aName = getNewObjectName(); + QString aName = getNewObjectName(); + if ( nbObjs > 1 ) { + if (aName.isEmpty()) + aName = getPrefix(*it); + if (nbObjs <= 30) { + // Try to find a unique name + aName = GEOMBase::GetDefaultName(aName); + } else { + // Don't check name uniqueness in case of numerous objects + aName = aName + "_" + QString::number(aNumber++); + } + } else { // PAL6521: use a prefix, if some dialog box doesn't reimplement getNewObjectName() if ( aName.isEmpty() ) aName = GEOMBase::GetDefaultName( getPrefix( *it ) ); diff --git a/src/GEOMBase/GEOMBase_Helper.h b/src/GEOMBase/GEOMBase_Helper.h index a5d21facb..20bcdae79 100755 --- a/src/GEOMBase/GEOMBase_Helper.h +++ b/src/GEOMBase/GEOMBase_Helper.h @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx index 84760134d..203f85834 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.cxx +++ b/src/GEOMBase/GEOMBase_Skeleton.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -27,11 +27,14 @@ // $Header$ #include "GEOMBase_Skeleton.h" + #include "GeometryGUI.h" -#include "SUIT_Session.h" #include "SalomeApp_Application.h" +#include "LightApp_Application.h" #include "LightApp_SelectionMgr.h" +#include "SUIT_Session.h" +#include "SUIT_MessageBox.h" #include @@ -44,9 +47,12 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -GEOMBase_Skeleton::GEOMBase_Skeleton(QWidget* parent, const char* name, bool modal, WFlags fl) - :DlgRef_Skeleton_QTD( parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ), - GEOMBase_Helper( dynamic_cast( parent ) ) +GEOMBase_Skeleton::GEOMBase_Skeleton(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + : DlgRef_Skeleton_QTD( parent, name, modal, WStyle_Customize | WStyle_NormalBorder + | WStyle_Title | WStyle_SysMenu | WDestructiveClose ), + GEOMBase_Helper( dynamic_cast( parent ) ), + myGeomGUI( theGeometryGUI ) { if (!name) setName("GEOMBase_Skeleton"); @@ -54,6 +60,7 @@ GEOMBase_Skeleton::GEOMBase_Skeleton(QWidget* parent, const char* name, bool mod buttonCancel->setText(tr("GEOM_BUT_CLOSE")); buttonOk->setText(tr("GEOM_BUT_OK")); buttonApply->setText(tr("GEOM_BUT_APPLY")); + buttonHelp->setText(tr("GEOM_BUT_HELP")); GroupMedium->close(TRUE); resize(0, 0); @@ -79,30 +86,23 @@ GEOMBase_Skeleton::~GEOMBase_Skeleton() //================================================================================= void GEOMBase_Skeleton::Init() { - myGeomGUI = 0; SalomeApp_Application* app = (SalomeApp_Application*)(SUIT_Session::session()->activeApplication()); - if (app) - { - SalomeApp_Module* module = dynamic_cast(app->loadModule("Geometry")); - if (module) - myGeomGUI = dynamic_cast(module); - } - + if (!myGeomGUI && app) + myGeomGUI = dynamic_cast( app->module( "Geometry" ) ); + /* init variables */ - myGeomBase = new GEOMBase(); // SAN -- TO BE REMOVED !!! myGeomGUI->SetActiveDialogBox(this); - + /* signals and slots connections */ connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); if (myGeomGUI) - { - connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - } - - /* Move widget on the botton right corner of main widget */ -// int x, y; -// myGeomBase->DefineDlgPosition( this, x, y ); + { + connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); + connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); + } + + // connect help button on a private slot that displays help information + connect( buttonHelp, SIGNAL( clicked() ), this, SLOT( ClickOnHelp() ) ); /* displays Dialog */ RadioButton1->setChecked(TRUE); @@ -217,3 +217,29 @@ int GEOMBase_Skeleton::getConstructorId() const return GroupConstructors->id( GroupConstructors->selected() ); return -1; } + +//================================================================================= +// function : ClickOnHelp() +// purpose : +//================================================================================= +void GEOMBase_Skeleton::ClickOnHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) + app->onHelpContextModule(myGeomGUI ? app->moduleName(myGeomGUI->moduleName()) : QString(""), myHelpFileName); + else { + SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(myHelpFileName), + QObject::tr("BUT_OK")); + } +} +//================================================================================= +// function : setHelpFileName() +// purpose : set name for help file html +//================================================================================= + +void GEOMBase_Skeleton::setHelpFileName(const QString& theName) +{ + myHelpFileName = theName; +} diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h index 31674a723..3223f6d4b 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.h +++ b/src/GEOMBase/GEOMBase_Skeleton.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : GEOMBase_Skeleton.h // Author : Damine COQUERET // Module : GEOM -// $Header$ #ifndef GEOMBASE_SKELETON_H #define GEOMBASE_SKELETON_H @@ -46,34 +45,44 @@ #include class GEOMBASE_EXPORT GEOMBase_Skeleton : public DlgRef_Skeleton_QTD, public GEOMBase_Helper -{ +{ Q_OBJECT public: - GEOMBase_Skeleton(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + GEOMBase_Skeleton(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~GEOMBase_Skeleton(); -// int getConstructorId() const; // returns id of a selected "constructor" radio button or '-1' in case of error -private : +private: void Init(); protected: void closeEvent(QCloseEvent* e); - void initName( const char* thePrefix = 0 ); // initialize "Name" field with a string "thePrefix_X" (Vertex_3) - virtual const char* getNewObjectName() const; // returns contents of "Name" field - int getConstructorId() const; // returns id of a selected "constructor" radio button or '-1' in case of error + /*! initialize "Name" field with a string "thePrefix_X" (Vertex_3) + */ + void initName( const char* thePrefix = 0 ); - QLineEdit* myEditCurrentArgument; /* Current LineEdit */ - GEOMBase* myGeomBase; // SAN -- TO BE REMOVED !!! - GeometryGUI* myGeomGUI; /* reference GEOM GUI */ + /*! returns contents of "Name" field + */ + virtual const char* getNewObjectName() const; + + /*! returns id of a selected "constructor" radio button or '-1' in case of error + */ + int getConstructorId() const; + + void setHelpFileName( const QString& ); + + QLineEdit* myEditCurrentArgument; //!< Current LineEdit + GeometryGUI* myGeomGUI; //!< reference GEOM GUI + QString myHelpFileName; protected slots: void ClickOnCancel(); void LineEditReturnPressed(); void DeactivateActiveDialog(); void ActivateThisDialog(); - + void ClickOnHelp(); }; #endif // GEOMBASE_SKELETON_H diff --git a/src/GEOMBase/GEOMBase_aParameterDlg.cxx b/src/GEOMBase/GEOMBase_aParameterDlg.cxx index 75614223b..ef6097e18 100644 --- a/src/GEOMBase/GEOMBase_aParameterDlg.cxx +++ b/src/GEOMBase/GEOMBase_aParameterDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMBase/GEOMBase_aParameterDlg.h b/src/GEOMBase/GEOMBase_aParameterDlg.h index 9da286375..8dc1773f7 100644 --- a/src/GEOMBase/GEOMBase_aParameterDlg.h +++ b/src/GEOMBase/GEOMBase_aParameterDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMBase/GEOM_Operation.cxx b/src/GEOMBase/GEOM_Operation.cxx index 2846c8f66..1e6d475c5 100644 --- a/src/GEOMBase/GEOM_Operation.cxx +++ b/src/GEOMBase/GEOM_Operation.cxx @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMBase/GEOM_Operation.h b/src/GEOMBase/GEOM_Operation.h index b4b753bcc..c6654a9ea 100644 --- a/src/GEOMBase/GEOM_Operation.h +++ b/src/GEOMBase/GEOM_Operation.h @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMBase/Makefile.in b/src/GEOMBase/Makefile.in index 260845ed6..070f91945 100644 --- a/src/GEOMBase/Makefile.in +++ b/src/GEOMBase/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -63,9 +63,9 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim +LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lDlgRef -lGEOM -lsuit -lOCCViewer -lVTKViewer $(CAS_LDPATH) -lTKPrim @CONCLUDE@ diff --git a/src/GEOMClient/GEOM_Client.cxx b/src/GEOMClient/GEOM_Client.cxx index 5c39bff45..2659f6209 100644 --- a/src/GEOMClient/GEOM_Client.cxx +++ b/src/GEOMClient/GEOM_Client.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMClient/GEOM_Client.hxx b/src/GEOMClient/GEOM_Client.hxx index 41a3a20fa..161fcc105 100644 --- a/src/GEOMClient/GEOM_Client.hxx +++ b/src/GEOMClient/GEOM_Client.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMClient/Makefile.in b/src/GEOMClient/Makefile.in index eb7281a67..742c633c3 100644 --- a/src/GEOMClient/Makefile.in +++ b/src/GEOMClient/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -53,9 +53,9 @@ BIN_CLIENT_IDL = BIN_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_TKTopAlgo) -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_TKTopAlgo) $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/GEOMContext/GEOMContext.cxx b/src/GEOMContext/GEOMContext.cxx index 9ca165efe..fd3ef0de9 100644 --- a/src/GEOMContext/GEOMContext.cxx +++ b/src/GEOMContext/GEOMContext.cxx @@ -16,7 +16,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMContext/GEOMContext.h b/src/GEOMContext/GEOMContext.h index cff8b74e7..ed339a216 100644 --- a/src/GEOMContext/GEOMContext.h +++ b/src/GEOMContext/GEOMContext.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMContext/GEOM_icons.po b/src/GEOMContext/GEOM_icons.po index ed64a379c..0bd0c46ee 100644 --- a/src/GEOMContext/GEOM_icons.po +++ b/src/GEOMContext/GEOM_icons.po @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. translating # from French to English, "Foo::Bar" would be translated to "Pub", diff --git a/src/GEOMContext/GEOM_msg_en.po b/src/GEOMContext/GEOM_msg_en.po index 5d07378e1..03a616200 100644 --- a/src/GEOMContext/GEOM_msg_en.po +++ b/src/GEOMContext/GEOM_msg_en.po @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. translating # from French to English, "Foo::Bar" would be translated to "Pub", diff --git a/src/GEOMContext/GEOM_msg_fr.po b/src/GEOMContext/GEOM_msg_fr.po index f0ba8041c..556d2d35f 100644 --- a/src/GEOMContext/GEOM_msg_fr.po +++ b/src/GEOMContext/GEOM_msg_fr.po @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. translating # from French to English, "Foo::Bar" would be translated to "Pub", diff --git a/src/GEOMContext/Makefile.in b/src/GEOMContext/Makefile.in index 991d7480e..8c1e60c92 100644 --- a/src/GEOMContext/Makefile.in +++ b/src/GEOMContext/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -57,9 +57,9 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) -LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS += -lOCCViewer -lVTKViewer -lSalomeObject -lSalomeGUI -lGEOMClient -lGEOMObject $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/GEOMDS/GEOMDS_Commands.cxx b/src/GEOMDS/GEOMDS_Commands.cxx index d2fa1c38e..54facab66 100644 --- a/src/GEOMDS/GEOMDS_Commands.cxx +++ b/src/GEOMDS/GEOMDS_Commands.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMDS/GEOMDS_Commands.jxx b/src/GEOMDS/GEOMDS_Commands.jxx index 8d4cccf10..879a3ac7b 100644 --- a/src/GEOMDS/GEOMDS_Commands.jxx +++ b/src/GEOMDS/GEOMDS_Commands.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx index 2dc864ac5..a73bb3eb2 100644 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_EdgeFilter.h" diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.h b/src/GEOMFiltersSelection/GEOM_EdgeFilter.h index e59406349..3cc49eecf 100644 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.h +++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef GEOM_EDGEFILTER_H #define GEOM_EDGEFILTER_H diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx index ea4428983..54a19c1de 100644 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx +++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx index 275670b55..1b3af3248 100644 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx +++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.ixx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx b/src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx index 267be7964..791245987 100644 --- a/src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx +++ b/src/GEOMFiltersSelection/GEOM_EdgeFilter.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx b/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx index 5d4ddb468..732165db7 100644 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_FaceFilter.h" diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.h b/src/GEOMFiltersSelection/GEOM_FaceFilter.h index affe68a3a..03a154218 100644 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.h +++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef GEOM_FACEFILTER_H #define GEOM_FACEFILTER_H diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.hxx b/src/GEOMFiltersSelection/GEOM_FaceFilter.hxx index de6e94893..7184542d4 100644 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.hxx +++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.ixx b/src/GEOMFiltersSelection/GEOM_FaceFilter.ixx index 4f81dc83b..92b872d7b 100644 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.ixx +++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.ixx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_FaceFilter.jxx b/src/GEOMFiltersSelection/GEOM_FaceFilter.jxx index 144d1a3f5..43abd891a 100644 --- a/src/GEOMFiltersSelection/GEOM_FaceFilter.jxx +++ b/src/GEOMFiltersSelection/GEOM_FaceFilter.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx b/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx index d9045576b..a67a99219 100644 --- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_LogicalFilter.h" diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h index 3b23884f7..dbb590c49 100644 --- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.h +++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef GEOM_LOGICALFILTER_H #define GEOM_LOGICALFILTER_H diff --git a/src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx b/src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx index aa9fbdccf..eeb6e61d3 100644 --- a/src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx +++ b/src/GEOMFiltersSelection/GEOM_LogicalFilter.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx index 5599a1524..e62acd406 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_OCCFilter.h" diff --git a/src/GEOMFiltersSelection/GEOM_OCCFilter.h b/src/GEOMFiltersSelection/GEOM_OCCFilter.h index c9080f297..eccfc5f6a 100644 --- a/src/GEOMFiltersSelection/GEOM_OCCFilter.h +++ b/src/GEOMFiltersSelection/GEOM_OCCFilter.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef GEOM_OCCFILTER_H #define GEOM_OCCFILTER_H diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx index a6d1b734b..1be775274 100644 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_PreviewFilter.h" diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h index d8e037bcc..e9c57f656 100644 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.h +++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef GEOM_PREVIEW_FILTER_H #define GEOM_PREVIEW_FILTER_H diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx index e27701ca6..14117451e 100644 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx +++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.hxx @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx index 6ec1aef97..2222f5188 100644 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx +++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.ixx @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx b/src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx index bd82eff74..4342c9cdb 100644 --- a/src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx +++ b/src/GEOMFiltersSelection/GEOM_PreviewFilter.jxx @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx index 5066277c1..6d20b194c 100644 --- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_SelectionFilter.h" diff --git a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h index 2682a4ec5..45b0fd969 100644 --- a/src/GEOMFiltersSelection/GEOM_SelectionFilter.h +++ b/src/GEOMFiltersSelection/GEOM_SelectionFilter.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef GEOM_SELECTIONFILTER_H #define GEOM_SELECTIONFILTER_H diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx index f074982a9..1de7bd2e0 100644 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx index 1d9df8e6d..5af6de182 100644 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx +++ b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx index db4643d12..86ca838f4 100644 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx +++ b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.ixx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx index 8a51985a1..0ddda3484 100644 --- a/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx +++ b/src/GEOMFiltersSelection/GEOM_ShapeTypeFilter.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx b/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx index 2379d012a..daa00f0f1 100644 --- a/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx +++ b/src/GEOMFiltersSelection/GEOM_TypeFilter.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_TypeFilter.h" diff --git a/src/GEOMFiltersSelection/GEOM_TypeFilter.h b/src/GEOMFiltersSelection/GEOM_TypeFilter.h index 4b938547f..ec2235ee7 100644 --- a/src/GEOMFiltersSelection/GEOM_TypeFilter.h +++ b/src/GEOMFiltersSelection/GEOM_TypeFilter.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef GEOM_TYPEFILTER_H #define GEOM_TYPEFILTER_H diff --git a/src/GEOMFiltersSelection/GEOM_TypeFilter.hxx b/src/GEOMFiltersSelection/GEOM_TypeFilter.hxx index e9c0b6e57..8be86f636 100644 --- a/src/GEOMFiltersSelection/GEOM_TypeFilter.hxx +++ b/src/GEOMFiltersSelection/GEOM_TypeFilter.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx index 581ddb235..37fb4c6da 100644 --- a/src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx +++ b/src/GEOMFiltersSelection/Handle_GEOM_EdgeFilter.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx index 49ae830d7..e1b669f5c 100644 --- a/src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx +++ b/src/GEOMFiltersSelection/Handle_GEOM_FaceFilter.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx index cb8285ee5..a5d7c5312 100644 --- a/src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx +++ b/src/GEOMFiltersSelection/Handle_GEOM_PreviewFilter.hxx @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx b/src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx index d20bf6d96..c9de83ce3 100644 --- a/src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx +++ b/src/GEOMFiltersSelection/Handle_GEOM_ShapeTypeFilter.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMFiltersSelection/Makefile.in b/src/GEOMFiltersSelection/Makefile.in index c56e5a1ca..def76cb9f 100644 --- a/src/GEOMFiltersSelection/Makefile.in +++ b/src/GEOMFiltersSelection/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -58,9 +58,9 @@ LIB_CLIENT_IDL= GEOM_Gen.idl SALOMEDS.idl SALOME_Exception.idl SALOME_GenericObj # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome -CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) -I$(GUI_ROOT_DIR)/include/salome -I$(KERNEL_ROOT_DIR)/include/salome -LDFLAGS += -L$(GUI_ROOT_DIR)/lib/salome -L$(KERNEL_ROOT_DIR)/lib/salome -lsuit -lSalomeApp +CPPFLAGS += $(QT_INCLUDES) $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(GUI_CXXFLAGS) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(QT_INCLUDES) $(BOOST_CPPFLAGS) $(GUI_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(GUI_LDFLAGS) $(KERNEL_LDFLAGS) -lsuit -lSalomeApp # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOMGUI/GEOMGUI.cxx b/src/GEOMGUI/GEOMGUI.cxx index 97fc874aa..aa6f6eae1 100644 --- a/src/GEOMGUI/GEOMGUI.cxx +++ b/src/GEOMGUI/GEOMGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMGUI/GEOMGUI.h b/src/GEOMGUI/GEOMGUI.h index 3ec371fb9..8874590bb 100644 --- a/src/GEOMGUI/GEOMGUI.h +++ b/src/GEOMGUI/GEOMGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx index c0868ae60..0103a5919 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.cxx +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOMGUI_OCCSelector.h" diff --git a/src/GEOMGUI/GEOMGUI_OCCSelector.h b/src/GEOMGUI/GEOMGUI_OCCSelector.h index 4b4a9b54a..81be7bc3b 100644 --- a/src/GEOMGUI/GEOMGUI_OCCSelector.h +++ b/src/GEOMGUI/GEOMGUI_OCCSelector.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef GEOMGUI_OCCSELECTOR_H #define GEOMGUI_OCCSELECTOR_H diff --git a/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx index 87cc9d630..f4a15ea35 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.cxx +++ b/src/GEOMGUI/GEOMGUI_Selection.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOMGUI_Selection.h" diff --git a/src/GEOMGUI/GEOMGUI_Selection.h b/src/GEOMGUI/GEOMGUI_Selection.h index c5ce368d7..5fb15727c 100644 --- a/src/GEOMGUI/GEOMGUI_Selection.h +++ b/src/GEOMGUI/GEOMGUI_Selection.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMGUI/GEOM_Displayer.cxx b/src/GEOMGUI/GEOM_Displayer.cxx index 40b20d41f..105d74879 100644 --- a/src/GEOMGUI/GEOM_Displayer.cxx +++ b/src/GEOMGUI/GEOM_Displayer.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMGUI/GEOM_Displayer.h b/src/GEOMGUI/GEOM_Displayer.h index bb16ba3a0..10c4d4ed4 100644 --- a/src/GEOMGUI/GEOM_Displayer.h +++ b/src/GEOMGUI/GEOM_Displayer.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMGUI/GEOM_images.po b/src/GEOMGUI/GEOM_images.po index 82790154e..60c149fc1 100644 --- a/src/GEOMGUI/GEOM_images.po +++ b/src/GEOMGUI/GEOM_images.po @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. translating # from French to English, "Foo::Bar" would be translated to "Pub", diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po index 4dcf34b03..0c2e2dcab 100644 --- a/src/GEOMGUI/GEOM_msg_en.po +++ b/src/GEOMGUI/GEOM_msg_en.po @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. translating # from French to English, "Foo::Bar" would be translated to "Pub", @@ -528,7 +547,7 @@ msgstr "Check Shape" #Check Blocks Compound msgid "GEOM_CHECK_BLOCKS_COMPOUND" -msgstr "Check Blocks Compound" +msgstr "Check and Improve Blocks Compound" #Check Blocks Compound Errors msgid "GEOM_CHECK_BLOCKS_COMPOUND_ERRORS" @@ -604,6 +623,10 @@ msgstr "Minor radius :" msgid "GEOM_COMPOUND" msgstr "Compound" +#Compound of Blocks +msgid "GEOM_BLOCKS_COMPOUND" +msgstr "BlocksCompound" + #CompSolid msgid "GEOM_COMPOUNDSOLID" msgstr "CompSolid" @@ -838,10 +861,6 @@ msgstr "Cylinder Construction" msgid "GEOM_CHECK_TITLE" msgstr "Check Shape Informations" -#: MeasureGUI_CheckCompoundOfBlocks.cxx:61 -msgid "GEOM_CHECK_COMPOUND_BLOCKS_TITLE" -msgstr "Check Blocks Compound" - #: GeometryGUI_CheckShape.cxx:83 msgid "GEOM_CHECK_INFOS" msgstr "Object And Its Topological Informations" diff --git a/src/GEOMGUI/GEOM_msg_fr.po b/src/GEOMGUI/GEOM_msg_fr.po index 3a3e3c481..0ccd32f9d 100644 --- a/src/GEOMGUI/GEOM_msg_fr.po +++ b/src/GEOMGUI/GEOM_msg_fr.po @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# # This is a Qt message file in .po format. Each msgid starts with # a scope. This scope should *NOT* be translated - eg. translating # from French to English, "Foo::Bar" would be translated to "Pub", diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx index 04cf3d313..a3d1796f0 100644 --- a/src/GEOMGUI/GeometryGUI.cxx +++ b/src/GEOMGUI/GeometryGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -77,16 +77,22 @@ extern "C" { -GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil(); +GEOM::GEOM_Gen_var GeometryGUI::myComponentGeom = GEOM::GEOM_Gen::_nil(); -GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen() { return GeometryGUI::myComponentGeom; } +GEOM::GEOM_Gen_var GeometryGUI::GetGeomGen() +{ + // Bug 12290: exception in Mesh GUI on GEOMBase::GetShape() if Geometry GUI hasn't been loaded + if (CORBA::is_nil(myComponentGeom)) + InitGeomGen(); + return GeometryGUI::myComponentGeom; +} -bool GeometryGUI::InitGeomGen() +bool GeometryGUI::InitGeomGen() { GeometryGUI aGG; - if( CORBA::is_nil( myComponentGeom ) ) return false; - return true; -} + if( CORBA::is_nil( myComponentGeom ) ) return false; + return true; +} //======================================================================= // function : ClientSObjectToObject @@ -334,7 +340,9 @@ void GeometryGUI::OnGUIEvent() //======================================================================= void GeometryGUI::OnGUIEvent( int id ) { - SUIT_Desktop* desk = application()->desktop(); + SUIT_Application* anApp = application(); + if (!anApp) return; + SUIT_Desktop* desk = anApp->desktop(); // check type of the active viewframe SUIT_ViewWindow* window = desk->activeWindow(); @@ -551,13 +559,16 @@ void GeometryGUI::OnGUIEvent( int id ) // function : GeometryGUI::OnKeyPress() // purpose : Called when any key is pressed by user [static] //================================================================================= -bool GeometryGUI::OnKeyPress( QKeyEvent* pe, SUIT_ViewWindow* win ) +void GeometryGUI::OnKeyPress( SUIT_ViewWindow* win, QKeyEvent* pe ) { GUIMap::Iterator it; bool bOk = true; - for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) - bOk = bOk && it.data()->OnKeyPress( pe, application()->desktop(), win ); - return bOk; + for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) { + SUIT_Application* anApp = application(); + if (!anApp) return; + bOk = bOk && it.data()->OnKeyPress( pe, anApp->desktop(), win ); + } +// return bOk; } @@ -565,13 +576,16 @@ bool GeometryGUI::OnKeyPress( QKeyEvent* pe, SUIT_ViewWindow* win ) // function : GeometryGUI::OnMouseMove() // purpose : Manages mouse move events [static] //================================================================================= -bool GeometryGUI::OnMouseMove( QMouseEvent* pe, SUIT_ViewWindow* win ) +void GeometryGUI::OnMouseMove( SUIT_ViewWindow* win, QMouseEvent* pe ) { GUIMap::Iterator it; bool bOk = true; - for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) - bOk = bOk && it.data()->OnMouseMove( pe, application()->desktop(), win ); - return bOk; + for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) { + SUIT_Application* anApp = application(); + if (!anApp) return; + bOk = bOk && it.data()->OnMouseMove( pe, anApp->desktop(), win ); + } +// return bOk; } @@ -579,15 +593,18 @@ bool GeometryGUI::OnMouseMove( QMouseEvent* pe, SUIT_ViewWindow* win ) // function : GeometryGUI::0nMousePress() // purpose : Manage mouse press events [static] //================================================================================= -bool GeometryGUI::OnMousePress( QMouseEvent* pe, SUIT_ViewWindow* win ) +void GeometryGUI::OnMousePress( SUIT_ViewWindow* win, QMouseEvent* pe ) { GUIMap::Iterator it; // OnMousePress() should return false if this event should be processed further // (see OCCViewer_Viewer3d::onMousePress() for explanation) bool processed = false; - for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) - processed = processed || it.data()->OnMousePress( pe, application()->desktop(), win ); - return processed; + for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) { + SUIT_Application* anApp = application(); + if (!anApp) return; + processed = processed || it.data()->OnMousePress( pe, anApp->desktop(), win ); + } +// return processed; } /* @@ -726,8 +743,8 @@ void GeometryGUI::createGeomAction( const int id, const QString& po_id, const QS //======================================================================= -// function : GeometryGUI::Deactivate() -// purpose : Called when GEOM module is deactivated [ static ] +// function : GeometryGUI::initialize() +// purpose : Called when GEOM module is created //======================================================================= void GeometryGUI::initialize( CAM_Application* app ) { @@ -1099,8 +1116,8 @@ void GeometryGUI::initialize( CAM_Application* app ) } //======================================================================= -// function : GeometryGUI::Deactivate() -// purpose : Called when GEOM module is deactivated [ static ] +// function : GeometryGUI::activateModule() +// purpose : Called when GEOM module is activated //======================================================================= bool GeometryGUI::activateModule( SUIT_Study* study ) { @@ -1115,12 +1132,14 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) setMenuShown( true ); setToolShown( true ); - connect( application()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ), + connect( application()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ), this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) ); - connect( (STD_Application*)application(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ), - this, SLOT( onViewManagerAdded( SUIT_ViewManager* ) ) ); - connect( (STD_Application*)application(), SIGNAL( viewManagerRemoved( SUIT_ViewManager* ) ), - this, SLOT( onViewManagerRemoved( SUIT_ViewManager* ) ) ); + + // Reset actions accelerator keys + //action(111)->setAccel(QKeySequence(CTRL + Key_I)); // Import + //action(121)->setAccel(QKeySequence(CTRL + Key_E)); // Export + action(111)->setEnabled(true); // Import + action(121)->setEnabled(true); // Export GUIMap::Iterator it; for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) @@ -1140,19 +1159,19 @@ bool GeometryGUI::activateModule( SUIT_Study* study ) getApp()->selectionMgr()->setEnabled( false, OCCViewer_Viewer::Type() ); for ( GEOMGUI_OCCSelector* sr = myOCCSelectors.first(); sr; sr = myOCCSelectors.next() ) sr->setEnabled(true); - + // disable VTK selectors getApp()->selectionMgr()->setEnabled( false, SVTK_Viewer::Type() ); for ( LightApp_VTKSelector* sr = myVTKSelectors.first(); sr; sr = myVTKSelectors.next() ) sr->setEnabled(true); - + return true; } //======================================================================= -// function : GeometryGUI::Deactivate() -// purpose : Called when GEOM module is deactivated [ static ] +// function : GeometryGUI::deactivateModule() +// purpose : Called when GEOM module is deactivated //======================================================================= bool GeometryGUI::deactivateModule( SUIT_Study* study ) { @@ -1161,10 +1180,6 @@ bool GeometryGUI::deactivateModule( SUIT_Study* study ) disconnect( application()->desktop(), SIGNAL( windowActivated( SUIT_ViewWindow* ) ), this, SLOT( onWindowActivated( SUIT_ViewWindow* ) ) ); - disconnect( (STD_Application*)application(), SIGNAL( viewManagerAdded( SUIT_ViewManager* ) ), - this, SLOT( onViewManagerAdded( SUIT_ViewManager* ) ) ); - disconnect( (STD_Application*)application(), SIGNAL( viewManagerRemoved( SUIT_ViewManager* ) ), - this, SLOT( onViewManagerRemoved( SUIT_ViewManager* ) ) ); EmitSignalCloseAllDialogs(); @@ -1172,6 +1187,12 @@ bool GeometryGUI::deactivateModule( SUIT_Study* study ) for ( it = myGUIMap.begin(); it != myGUIMap.end(); ++it ) it.data()->deactivate(); + // Unset actions accelerator keys + //action(111)->setAccel(QKeySequence()); // Import + //action(121)->setAccel(QKeySequence()); // Export + action(111)->setEnabled(false); // Import + action(121)->setEnabled(false); // Export + myOCCSelectors.clear(); getApp()->selectionMgr()->setEnabled( true, OCCViewer_Viewer::Type() ); @@ -1493,7 +1514,7 @@ void GeometryGUI::BuildPresentation( const Handle(SALOME_InteractiveObject)& io, } //======================================================================= -// function : setCommandsEnabled() +// function : onWindowActivated() // purpose : update menu items' status - disable non-OCC-viewer-compatible actions //======================================================================= void GeometryGUI::onWindowActivated( SUIT_ViewWindow* win ) @@ -1535,6 +1556,15 @@ void GeometryGUI::onViewManagerAdded( SUIT_ViewManager* vm ) { if ( vm->getType() == OCCViewer_Viewer::Type() ) { + qDebug( "connect" ); + connect( vm, SIGNAL( keyPress ( SUIT_ViewWindow*, QKeyEvent* ) ), + this, SLOT( OnKeyPress( SUIT_ViewWindow*, QKeyEvent* ) ) ); + connect( vm, SIGNAL( mousePress( SUIT_ViewWindow*, QMouseEvent* ) ), + this, SLOT( OnMousePress( SUIT_ViewWindow*, QMouseEvent* ) ) ); + connect( vm, SIGNAL( mouseMove ( SUIT_ViewWindow*, QMouseEvent* ) ), + this, SLOT( OnMouseMove( SUIT_ViewWindow*, QMouseEvent* ) ) ); + + LightApp_SelectionMgr* sm = getApp()->selectionMgr(); myOCCSelectors.append( new GEOMGUI_OCCSelector( ((OCCViewer_ViewManager*)vm)->getOCCViewer(), sm ) ); diff --git a/src/GEOMGUI/GeometryGUI.h b/src/GEOMGUI/GeometryGUI.h index 6efd5c234..f6e93644a 100644 --- a/src/GEOMGUI/GeometryGUI.h +++ b/src/GEOMGUI/GeometryGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -101,10 +101,6 @@ public: void OnGUIEvent( int id ); - virtual bool OnKeyPress( QKeyEvent*, SUIT_ViewWindow* ); - virtual bool OnMousePress( QMouseEvent*, SUIT_ViewWindow* ); - virtual bool OnMouseMove( QMouseEvent*, SUIT_ViewWindow* ); - // virtual bool SetSettings(); // virtual void SupportedViewType ( int* buffer, int bufferSize ); virtual void BuildPresentation( const Handle(SALOME_InteractiveObject)&, SUIT_ViewWindow* = 0 ); @@ -129,11 +125,16 @@ public: public slots: virtual bool deactivateModule( SUIT_Study* ); virtual bool activateModule( SUIT_Study* ); + virtual void OnKeyPress ( SUIT_ViewWindow*, QKeyEvent* ); + virtual void OnMousePress( SUIT_ViewWindow*, QMouseEvent* ); + virtual void OnMouseMove ( SUIT_ViewWindow*, QMouseEvent* ); + +protected slots: + virtual void onViewManagerAdded( SUIT_ViewManager* ); + virtual void onViewManagerRemoved( SUIT_ViewManager* ); private slots: void OnGUIEvent(); - void onViewManagerAdded( SUIT_ViewManager* ); - void onViewManagerRemoved( SUIT_ViewManager* ); void onWindowActivated( SUIT_ViewWindow* ); signals : diff --git a/src/GEOMGUI/GeometryGUI_Swig.cxx b/src/GEOMGUI/GeometryGUI_Swig.cxx index 9a10ef6df..0e75e9aec 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.cxx +++ b/src/GEOMGUI/GeometryGUI_Swig.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -45,12 +45,14 @@ #include "SVTK_ViewModel.h" #include "SVTK_ViewWindow.h" #include "SVTK_View.h" +#include "SVTK_Renderer.h" #include "GEOM_Actor.h" #include "GEOM_Client.hxx" #include "GEOM_AISShape.hxx" #include "GEOM_AssemblyBuilder.h" #include "GEOM_InteractiveObject.hxx" +#include "GEOM_Displayer.h" #include "SALOME_Event.hxx" @@ -59,21 +61,17 @@ #include "SALOMEDSClient.hxx" // OCCT Includes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include #include #include -#include +#include + +// IDL Headers +#include +#include CORBA_SERVER_HEADER(GEOM_Gen) + +#include using namespace std; @@ -180,7 +178,8 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry) "GEOM", const_cast( obj->GetID().c_str())); - if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app)) { + GEOM_Displayer(ActiveStudy).Display(anIO, true); + /*if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app)) { SVTK_View* aView = aViewWindow->getView(); int aMode = aView->GetDisplayMode(); @@ -202,7 +201,7 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry) aSh->setIO(anIO); ic->Display(aSh); ic->AddOrRemoveCurrentObject(aSh,true); - } + }*/ // update object browser SalomeApp_Application* app = NULL; //dynamic_cast(app); if (app) { @@ -224,7 +223,8 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry) public: TEventUpdateBrowser() {} virtual void Execute() { - SalomeApp_Application* app = dynamic_cast(SUIT_Session::session()->activeApplication()); + SalomeApp_Application* app = + dynamic_cast(SUIT_Session::session()->activeApplication()); if (app) { CAM_Module* module = app->module("Geometry"); SalomeApp_Module* appMod = dynamic_cast(module); @@ -236,125 +236,81 @@ void GEOM_Swig::createAndDisplayGO (const char* Entry) ProcessVoidEvent(new TEventUpdateBrowser ()); } +void GEOM_Swig::createAndDisplayFitAllGO (const char* Entry) +{ + class TEventFitAll: public SALOME_Event + { + public: + TEventFitAll() {} + virtual void Execute() { + SUIT_Application* app = SUIT_Session::session()->activeApplication(); + if (!app) return; + + if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(app)) + { + SVTK_View* aView = aViewWindow->getView(); + aView->GetRenderer()->OnFitAll(); + } + else if (OCCViewer_Viewer* occViewer = GetOCCViewer(app)) + { + Handle(V3d_Viewer) aViewer3d = occViewer->getViewer3d(); + aViewer3d->InitActiveViews(); + + if (aViewer3d->MoreActiveViews()) + aViewer3d->ActiveView()->FitAll(); + } + } + }; -int GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR) + createAndDisplayGO(Entry); + ProcessVoidEvent(new TEventFitAll()); +} + +int GEOM_Swig::getIndexTopology(const char* SubIOR, const char* IOR) { - GEOM::GEOM_Gen_var Geom = GeometryGUI::GetGeomGen(); - if ( CORBA::is_nil( Geom ) ) + GEOM::GEOM_Gen_var aGeomGen = GeometryGUI::GetGeomGen(); + if (CORBA::is_nil(aGeomGen)) return -1; - GEOM::GEOM_Object_var aMainShape = Geom->GetIORFromString(IOR); - TopoDS_Shape shape = ShapeReader.GetShape(Geom, aMainShape); - - GEOM::GEOM_Object_var aSubShape = Geom->GetIORFromString(SubIOR); - TopoDS_Shape subshape = ShapeReader.GetShape(Geom, aSubShape); - - int index = 1; - if(subshape.ShapeType() == TopAbs_COMPOUND) { - TopoDS_Iterator it; - TopTools_ListOfShape CL; - CL.Append(shape); - TopTools_ListIteratorOfListOfShape itC; - for(itC.Initialize(CL); itC.More(); itC.Next()) { - for(it.Initialize(itC.Value()); it.More(); it.Next()) { - if (it.Value().ShapeType() == TopAbs_COMPOUND) { - if (it.Value().IsSame(subshape)) - return index; - else - index++; - CL.Append(it.Value()); - } - } - } - } - else { - TopExp_Explorer Exp(shape, subshape.ShapeType()); - TopTools_MapOfShape M; - while(Exp.More()) { - if(M.Add(Exp.Current())) { - if(Exp.Current().IsSame(subshape)) - return index; - index++; - } - Exp.Next(); - } - } + GEOM::GEOM_Object_var aMainShape = aGeomGen->GetIORFromString(IOR); + GEOM::GEOM_Object_var aSubShape = aGeomGen->GetIORFromString(SubIOR); + if (CORBA::is_nil(aMainShape) || CORBA::is_nil(aSubShape)) + return -1; + + GEOM::GEOM_IShapesOperations_var anIShapesOperations = + aGeomGen->GetIShapesOperations(aMainShape->GetStudyID()); + if (CORBA::is_nil(anIShapesOperations)) + return -1; - return -1; + return anIShapesOperations->GetTopologyIndex(aMainShape, aSubShape); } const char* GEOM_Swig::getShapeTypeString(const char* IOR) { - GEOM::GEOM_Gen_var Geom = GeometryGUI::GetGeomGen(); - if ( CORBA::is_nil( Geom ) ) - return 0; - - GEOM::GEOM_Object_var aShape = Geom->GetIORFromString(IOR); - TopoDS_Shape shape = ShapeReader.GetShape(Geom, aShape); + TCollection_AsciiString aTypeName ("Shape of unknown type"); - if( shape.IsNull() ) { - return "Null Shape" ; - } - - switch (shape.ShapeType() ) + GEOM::GEOM_Gen_var aGeomGen = GeometryGUI::GetGeomGen(); + if (!CORBA::is_nil(aGeomGen)) { - case TopAbs_COMPOUND: - { return "Compound" ;} - case TopAbs_COMPSOLID: - { return "Compound Solid" ;} - case TopAbs_SOLID: - { return "Solid" ;} - case TopAbs_SHELL: - { return "Shell" ;} - case TopAbs_FACE: + GEOM::GEOM_Object_var aShape = aGeomGen->GetIORFromString(IOR); + if (!CORBA::is_nil(aShape)) { - BRepAdaptor_Surface surf(TopoDS::Face(shape)); - if ( surf.GetType() == GeomAbs_Plane ) { - return "Plane" ; - } else if ( surf.GetType() == GeomAbs_Cylinder ) { - return "Cylindrical Face" ; - } else if ( surf.GetType() == GeomAbs_Sphere ) { - return "Spherical Face" ; - } else if ( surf.GetType() == GeomAbs_Torus ) { - return "Toroidal Face" ; - } else if ( surf.GetType() == GeomAbs_Cone ) { - return "Conical Face" ; - } else { - return "GEOM::FACE" ; + GEOM::GEOM_IShapesOperations_var anIShapesOperations = + aGeomGen->GetIShapesOperations(aShape->GetStudyID()); + if (!CORBA::is_nil(anIShapesOperations)) + { + aTypeName = anIShapesOperations->GetShapeTypeString(aShape); } } - case TopAbs_WIRE: - { return "Wire" ;} - case TopAbs_EDGE: - { - BRepAdaptor_Curve curv(TopoDS::Edge(shape)); - if ( curv.GetType() == GeomAbs_Line ) { - if ( (Abs(curv.FirstParameter()) >= 1E6 ) || - (Abs(curv.LastParameter()) >= 1E6 )) { - return "Line" ; - } else - return "Edge" ; - } else if ( curv.GetType() == GeomAbs_Circle ) { - if ( curv.IsClosed() ) - return "Circle" ; - else - return "Arc" ; - } else { - return "Edge" ; - } - } - case TopAbs_VERTEX: - { return "Vertex" ;} - case TopAbs_SHAPE: - { return "Shape" ;} } - return 0; + + return CORBA::string_dup(aTypeName.ToCString()); } const char* GEOM_Swig::getShapeTypeIcon(const char* IOR) { - GEOM::GEOM_Gen_var Geom = GeometryGUI::GetGeomGen(); + GEOM::GEOM_Gen_var Geom = GeometryGUI::GetGeomGen(); if ( CORBA::is_nil( Geom ) ) return "None"; @@ -390,75 +346,74 @@ const char* GEOM_Swig::getShapeTypeIcon(const char* IOR) void GEOM_Swig::setDisplayMode(const char* theEntry, int theMode) { - SUIT_Application* app = SUIT_Session::session()->activeApplication(); - if ( !app ) return; - - Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject(theEntry, "GEOM", ""); - - class TEvent: public SALOME_Event{ - SUIT_Application* myApp; - Handle(SALOME_InteractiveObject) myIO; - int myParam; + class TEvent: public SALOME_Event { + std::string myEntry; + int myMode; public: - TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, int theParam): - myApp(theApp), myIO(theIO), myParam(theParam) + TEvent(const char* theEntryArg, int theModeArg): + myEntry(theEntryArg), myMode(theModeArg) {} - virtual void Execute(){ - if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){ + virtual void Execute() { + SUIT_Application* anApp = SUIT_Session::session()->activeApplication(); + if (!anApp) return; + + Handle(SALOME_InteractiveObject) anIO = + new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", ""); + + if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(anApp)) { SVTK_View* aView = aViewWindow->getView(); - aView->SetDisplayMode(myIO,myParam); + aView->SetDisplayMode(anIO, myMode); aView->Repaint(); } - else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) { - SOCC_Viewer* soccViewer = dynamic_cast( occViewer ); + else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) { + SOCC_Viewer* soccViewer = dynamic_cast(occViewer); if (soccViewer) - soccViewer->switchRepresentation(myIO,myParam); + soccViewer->switchRepresentation(anIO, myMode); } } }; - ProcessVoidEvent(new TEvent(app,anIO,theMode)); + ProcessVoidEvent(new TEvent (theEntry, theMode)); } void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue) { - SUIT_Application* app = SUIT_Session::session()->activeApplication(); - if ( !app ) return; - - Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject(theEntry, "GEOM", ""); - - QColor aColor(red,green,blue); - - class TEvent: public SALOME_Event{ - SUIT_Application* myApp; - Handle(SALOME_InteractiveObject) myIO; - QColor myParam; + class TEvent: public SALOME_Event { + std::string myEntry; + int myRed; + int myGreen; + int myBlue; public: - TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, const QColor& theParam): - myApp(theApp), myIO(theIO), myParam(theParam) + TEvent(const char* theEntryArg, int theR, int theG, int theB): + myEntry(theEntryArg), myRed(theR), myGreen(theG), myBlue(theB) {} - virtual void Execute(){ - if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){ + virtual void Execute() { + SUIT_Application* anApp = SUIT_Session::session()->activeApplication(); + if (!anApp) return; + + Handle(SALOME_InteractiveObject) anIO = + new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", ""); + + if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(anApp)){ SVTK_View* aView = aViewWindow->getView(); - aView->SetColor(myIO,myParam); + QColor aColor (myRed, myGreen, myBlue); + aView->SetColor(anIO, aColor); aView->Repaint(); - }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)){ + } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) { Handle(AIS_InteractiveContext) ic = occViewer->getAISContext(); AIS_ListOfInteractive List; ic->DisplayedObjects(List); - AIS_ListIteratorOfListOfInteractive ite(List); - for ( ; ite.More(); ite.Next() ) { + AIS_ListIteratorOfListOfInteractive ite (List); + for (; ite.More(); ite.Next()) { Handle(SALOME_InteractiveObject) anObj = - Handle(SALOME_InteractiveObject)::DownCast( ite.Value()->GetOwner() ); - if ( !anObj.IsNull() && anObj->hasEntry() && anObj->isSame( myIO ) ) { - Quantity_Color CSFColor = Quantity_Color ( myParam.red() / 255., - myParam.green() / 255., - myParam.blue() / 255., - Quantity_TOC_RGB ); - ite.Value()->SetColor( CSFColor ); - if ( ite.Value()->IsKind( STANDARD_TYPE(GEOM_AISShape) ) ) - Handle(GEOM_AISShape)::DownCast( ite.Value() )->SetShadingColor( CSFColor ); - ite.Value()->Redisplay( Standard_True ); + Handle(SALOME_InteractiveObject)::DownCast(ite.Value()->GetOwner()); + if (!anObj.IsNull() && anObj->hasEntry() && anObj->isSame(anIO)) { + Quantity_Color CSFColor = + Quantity_Color(myRed/255., myGreen/255., myBlue/255., Quantity_TOC_RGB); + ite.Value()->SetColor(CSFColor); + if (ite.Value()->IsKind(STANDARD_TYPE(GEOM_AISShape))) + Handle(GEOM_AISShape)::DownCast(ite.Value())->SetShadingColor(CSFColor); + ite.Value()->Redisplay(Standard_True); occViewer->update(); break; } @@ -466,42 +421,184 @@ void GEOM_Swig::setColor(const char* theEntry, int red, int green, int blue) } } }; - ProcessVoidEvent(new TEvent(app,anIO,aColor)); + ProcessVoidEvent(new TEvent(theEntry, red, green, blue)); } void GEOM_Swig::setTransparency(const char* theEntry, float transp) { - SUIT_Application* app = SUIT_Session::session()->activeApplication(); - if ( !app ) return; - - Handle(SALOME_InteractiveObject) anIO = new SALOME_InteractiveObject(theEntry, "GEOM", ""); - - class TEvent: public SALOME_Event{ - SUIT_Application* myApp; - Handle(SALOME_InteractiveObject) myIO; + class TEvent: public SALOME_Event { + std::string myEntry; float myParam; public: - TEvent(SUIT_Application* theApp, const Handle(SALOME_InteractiveObject)& theIO, float theParam): - myApp(theApp), myIO(theIO), myParam(theParam) + TEvent(const char* theEntryArg, float theParam): + myEntry(theEntryArg), myParam(theParam) {} - virtual void Execute(){ - if(SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(myApp)){ + virtual void Execute() { + SUIT_Application* anApp = SUIT_Session::session()->activeApplication(); + if (!anApp) return; + + Handle(SALOME_InteractiveObject) anIO = + new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", ""); + + if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(anApp)) { SVTK_View* aView = aViewWindow->getView(); - aView->SetTransparency(myIO,myParam); + aView->SetTransparency(anIO, myParam); aView->Repaint(); - }else if(OCCViewer_Viewer* occViewer = GetOCCViewer(myApp)) { - SOCC_Viewer* soccViewer = dynamic_cast( occViewer ); + } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) { + SOCC_Viewer* soccViewer = dynamic_cast(occViewer); if (soccViewer) - soccViewer->setTransparency(myIO,myParam); + soccViewer->setTransparency(anIO, myParam); } } }; - ProcessVoidEvent(new TEvent(app,anIO,transp)); + ProcessVoidEvent(new TEvent (theEntry, transp)); } +class TInitGeomGenEvent: public SALOME_Event { +public: + typedef bool TResult; + TResult myResult; + TInitGeomGenEvent() : myResult(false) {} + virtual void Execute() { + myResult = GeometryGUI::InitGeomGen(); + } +}; bool GEOM_Swig::initGeomGen() { - return GeometryGUI::InitGeomGen(); + return ProcessEvent(new TInitGeomGenEvent()); +} + + + +void GEOM_Swig::eraseGO (const char* Entry, bool allWindows) +{ + class TEvent: public SALOME_Event + { + std::string myEntry; + bool myFromAllWindows; + public: + TEvent(const char* theEntry, bool fromAllWindows): + myEntry(theEntry), myFromAllWindows(fromAllWindows) + {} + virtual void Execute() + { + SUIT_Application* app = SUIT_Session::session()->activeApplication(); + if (!app) return; + SalomeApp_Study* ActiveStudy = dynamic_cast(app->activeStudy()); + if (!ActiveStudy) return; + + Handle (SALOME_InteractiveObject) aIO = new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", ""); + + GEOM_Displayer(ActiveStudy).Erase(aIO, true); + /* if (myFromAllWindows) { + QPtrList aWindows = app->desktop()->windows(); + SUIT_ViewWindow* aWin = 0; + for (aWin = aWindows.first(); aWin; aWin = aWindows.next()) { + EraseObject(aWin, aIO); + } + } else { + SUIT_ViewWindow* aWin = app->desktop()->activeWindow(); + if (aWin) + EraseObject(aWin, aIO); + }*/ + } + + /* private: + void EraseObject(SUIT_ViewWindow* theWin, Handle (SALOME_InteractiveObject) theIO) + { + if (theWin->getViewManager()->getType() == OCCViewer_Viewer::Type()){ + OCCViewer_ViewWindow* vw = dynamic_cast( theWin ); + if ( vw ) { + OCCViewer_ViewManager* vm = dynamic_cast( vw->getViewManager() ); + if ( vm ) { + SOCC_Viewer* aViewer = dynamic_cast(vm->getOCCViewer()); + if (aViewer) { + SALOME_Prs* aPrs = aViewer->CreatePrs(myEntry.c_str()); + if (aPrs) { + SALOME_OCCPrs* aOccPrs = dynamic_cast(aPrs); + if (aOccPrs) { + aViewer->Erase(aOccPrs); + aViewer->Repaint(); + } + } + } + } + } + } else if (theWin->getViewManager()->getType() == SVTK_Viewer::Type()){ + SVTK_ViewWindow* aViewWindow = dynamic_cast( theWin ); + if (aViewWindow) { + aViewWindow->Erase(theIO); + } + } + }*/ + + }; + ProcessVoidEvent(new TEvent(Entry, allWindows)); +} + + + +void GEOM_Swig::setDeflection(const char* theEntry, float theDeflect) +{ + class TEvent: public SALOME_Event { + std::string myEntry; + float myParam; + public: + TEvent(const char* theEntryArg, float theParam): + myEntry(theEntryArg), myParam(theParam) + {} + virtual void Execute() { + SUIT_Application* anApp = SUIT_Session::session()->activeApplication(); + if (!anApp) return; + + Handle(SALOME_InteractiveObject) anIO = + new SALOME_InteractiveObject(myEntry.c_str(), "GEOM", ""); + + if (SVTK_ViewWindow* aViewWindow = GetSVTKViewWindow(anApp)) { + vtkActorCollection* aActors = aViewWindow->getRenderer()->GetActors(); + aActors->InitTraversal(); + while (vtkActor* aAct = aActors->GetNextActor()) { + if (GEOM_Actor* aGeomActor = dynamic_cast(aAct)) { + if (aGeomActor->hasIO()) { + Handle(SALOME_InteractiveObject) aNextIO = aGeomActor->getIO(); + if (aNextIO->isSame(anIO)) { + aGeomActor->setDeflection(myParam); + aViewWindow->Repaint(); + return; + } + } + } + } + // aView->SetTransparency(anIO, myParam); + //aView->Repaint(); + } else if (OCCViewer_Viewer* occViewer = GetOCCViewer(anApp)) { + Handle(AIS_InteractiveContext) aContext = occViewer->getAISContext(); + AIS_ListOfInteractive aAISList; + aContext->DisplayedObjects(aAISList); + AIS_ListIteratorOfListOfInteractive it(aAISList); + for (; it.More(); it.Next()) { + Handle(SALOME_InteractiveObject) aObj = + Handle(SALOME_InteractiveObject)::DownCast(it.Value()->GetOwner()); + if ((!aObj.IsNull()) && aObj->hasEntry() && aObj->isSame(anIO)) { + Handle(AIS_Shape) aShape = Handle(AIS_Shape)::DownCast(it.Value()); + if (!aShape.IsNull()) { + Handle(AIS_Drawer) aDrawer = aShape->Attributes(); + if (aDrawer.IsNull()) + aDrawer = new AIS_Drawer(); + aDrawer->SetDeviationCoefficient(myParam); + aShape->SetAttributes(aDrawer); + aContext->Redisplay(aShape, true, true); + aContext->UpdateCurrentViewer(); + return; + } + } + } + } + } + }; + + ProcessVoidEvent(new TEvent (theEntry, theDeflect)); } + diff --git a/src/GEOMGUI/GeometryGUI_Swig.hxx b/src/GEOMGUI/GeometryGUI_Swig.hxx index 67e0b9e68..e441a6cdc 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.hxx +++ b/src/GEOMGUI/GeometryGUI_Swig.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -46,9 +46,12 @@ public: ~GEOM_Swig(); void createAndDisplayGO(const char* Entry); + void eraseGO(const char* Entry, bool allWindows); + void createAndDisplayFitAllGO(const char* Entry); void setDisplayMode(const char* Entry, int mode); void setColor(const char* Entry, int red, int green, int blue); void setTransparency(const char* Entry, float transp); + void setDeflection(const char* Entry, float deflect); int getIndexTopology(const char *SubEntry, const char *Entry); const char* getShapeTypeString(const char *Entry); diff --git a/src/GEOMGUI/GeometryGUI_Swig.i b/src/GEOMGUI/GeometryGUI_Swig.i index d8be6b738..07a99e9ac 100644 --- a/src/GEOMGUI/GeometryGUI_Swig.i +++ b/src/GEOMGUI/GeometryGUI_Swig.i @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -37,12 +37,15 @@ class GEOM_Swig ~GEOM_Swig(); void createAndDisplayGO(const char* Entry); + void eraseGO(const char* Entry, bool allWindows); + void createAndDisplayFitAllGO(const char* Entry); int getIndexTopology(const char *SubEntry, const char *Entry); const char* getShapeTypeString(const char *Entry); void setDisplayMode(const char* Entry, int mode); void setColor(const char* Entry, int red, int green, int blue); void setTransparency(const char* Entry, float transp); + void setDeflection(const char* Entry, float deflect); const char* getShapeTypeIcon(const char *Ior); bool initGeomGen(); diff --git a/src/GEOMGUI/Makefile.in b/src/GEOMGUI/Makefile.in index a14ea4cb1..3e8dd2114 100644 --- a/src/GEOMGUI/Makefile.in +++ b/src/GEOMGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -64,15 +64,16 @@ LIB_CLIENT_IDL = SALOME_Exception.idl \ SALOMEDS.idl \ SALOMEDS_Attributes.idl \ SALOME_GenericObj.idl \ - SALOME_Component.idl + SALOME_Component.idl \ + GEOM_Gen.idl LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome -CXXFLAGS += $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += -lGEOMFiltersSelection -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -lGEOMClient -lSOCC -lSVTK -lGEOMObject -lToolsGUI -lEvent +LDFLAGS += -lGEOMFiltersSelection $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lOCCViewer -lVTKViewer -lSalomeApp -lCAM -lGEOMClient -lSOCC -lSVTK -lGEOMObject -lToolsGUI -lEvent @CONCLUDE@ diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx index 4b249d296..ded4e8b69 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx index df27e163b..89dbdcf81 100644 --- a/src/GEOMImpl/GEOMImpl_ArcDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArcDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_ArcDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx index ae6487e62..fbd03ee9e 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOMImpl_ArchimedeDriver.hxx" diff --git a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx index ab15bfe18..3dbe0b615 100644 --- a/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ArchimedeDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_ArchimedeDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx index a73609e60..8366db405 100644 --- a/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx +++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.cxx @@ -15,14 +15,14 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include -#include - #include +#include + #include "utilities.h" #include @@ -33,6 +33,8 @@ #include #include #include +#include +#include #include #include #include @@ -1202,43 +1204,61 @@ void GEOMImpl_Block6Explorer::MakeFace (const TopoDS_Wire& theWire, // Result of filling TopoDS_Shape aFace = MF.Shape(); - // Update tolerance - Standard_Real aTol = MF.G0Error(); - - TColgp_Array1OfPnt aPnts (1,nbEdges); // points of the given wire - BRepTools_WireExplorer aWE1 (theWire); - Standard_Integer vi = 1; - for (; aWE1.More() && vi <= nbEdges; aWE1.Next(), vi++) { - aPnts(vi) = BRep_Tool::Pnt(TopoDS::Vertex(aWE1.CurrentVertex())); + // 12.04.2006 for PAL12149 begin + Handle(Geom_Surface) aGS = BRep_Tool::Surface(TopoDS::Face(aFace)); + BRepBuilderAPI_MakeFace MK1 (aGS, theWire); + if (MK1.IsDone()) { + TopoDS_Shape aFace1 = MK1.Shape(); + + BRepCheck_Analyzer ana (aFace1, false); + if (!ana.IsValid()) { + TopoDS_Shape aFace2; + ShHealOper_ShapeProcess aHealer; + aHealer.Perform(aFace1, aFace2); + if (aHealer.isDone()) + theResult = aFace2; + } } + // 12.04.2006 for PAL12149 end - // 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))); + if (theResult.IsNull()) { // try to deal with pure result of filling + // Update tolerance + Standard_Real aTol = MF.G0Error(); + + TColgp_Array1OfPnt aPnts (1,nbEdges); // points of the given wire + BRepTools_WireExplorer aWE1 (theWire); + Standard_Integer vi = 1; + for (; aWE1.More() && vi <= nbEdges; aWE1.Next(), vi++) { + aPnts(vi) = BRep_Tool::Pnt(TopoDS::Vertex(aWE1.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, aTolV); + aTol = Max(aTol, min_dist); } - aTol = Max(aTol, aTolV); - aTol = Max(aTol, min_dist); } - } - if ((*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance() < aTol) { - (*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance(aTol); + if ((*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance() < aTol) { + (*((Handle(BRep_TFace)*)&aFace.TShape()))->Tolerance(aTol); + } + theResult = aFace; } - theResult = aFace; } } else { // try to update wire tolerances to build a planar face - // With OCCT6.0 or lower - +#if 1 //(OCC_VERSION_MAJOR < 6) || (OCC_VERSION_MAJOR == 6 && OCC_VERSION_MINOR <= 1) // Find a deviation Standard_Real aToleranceReached, aTol; BRepLib_FindSurface aFS; @@ -1276,12 +1296,13 @@ void GEOMImpl_Block6Explorer::MakeFace (const TopoDS_Wire& theWire, return; } - // After migration on OCCT version higher than 6.0 - //BRepLib_MakeFace aBMF; - //aBMF.Init(theWire, isPlanarWanted, Standard_True); - //if (aBMF.Error() == BRepLib_FaceDone) { - // theResult = aBMF.Shape(); - // return; - //} +#else // After migration on OCCT version, containing PKV's fix. See bug 8293 + BRepLib_MakeFace aBMF; + aBMF.Init(theWire, isPlanarWanted, Standard_True); + if (aBMF.Error() == BRepLib_FaceDone) { + theResult = aBMF.Shape(); + return; + } +#endif } } diff --git a/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx b/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx index 1cedbe1f3..db0613668 100644 --- a/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx +++ b/src/GEOMImpl/GEOMImpl_Block6Explorer.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_Block6Explorer.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx index e9ed601c2..9e2d85745 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx index ab3ea4dfe..a51ca743a 100644 --- a/src/GEOMImpl/GEOMImpl_BlockDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BlockDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_BlockDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx index f427e61e8..a0ae0bc0c 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx index c65e964ee..a9b198ce1 100644 --- a/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BooleanDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_BooleanDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx index 99e1ff87d..16e26a843 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx index a7692f639..7721d2a04 100644 --- a/src/GEOMImpl/GEOMImpl_BoxDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_BoxDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_BoxDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx index 7cabd43cf..57cc91748 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx index 605683be8..fbcd12928 100644 --- a/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ChamferDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_ChamferDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx index 61dedcccc..7d3343366 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx index c71752dbd..8eb470385 100644 --- a/src/GEOMImpl/GEOMImpl_CircleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CircleDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_CircleDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx index fa89e2c03..d9ee6044a 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx index 02cf07d6f..7c53100a6 100644 --- a/src/GEOMImpl/GEOMImpl_ConeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ConeDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_ConeDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx index f2abc002c..6fd87146f 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx index 53d58aa7a..ca86e7664 100644 --- a/src/GEOMImpl/GEOMImpl_CopyDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CopyDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_CopyDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx index baff87eea..cba3e36c5 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx index ba55aac2b..a7799c927 100644 --- a/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_CylinderDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_CylinderDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx index fe5ddfe59..03685a46b 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx index c1d16b9a6..9e80dc606 100644 --- a/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_EllipseDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_EllipseDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx index 5898d9e1b..77d6acc32 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -48,7 +48,9 @@ #define UnLoadLib( handle ) dlclose( handle ); #endif -typedef int (*funcPoint)(const TopoDS_Shape&, const TCollection_AsciiString&); +typedef int (*funcPoint)(const TopoDS_Shape&, + const TCollection_AsciiString&, + const TCollection_AsciiString&); //======================================================================= //function : GetID @@ -90,9 +92,10 @@ Standard_Integer GEOMImpl_ExportDriver::Execute(TFunction_Logbook& log) const aFunction->SetValue(aShape); // retrieve the file and format names - TCollection_AsciiString aFileName = aCI.GetFileName(); - TCollection_AsciiString aLibName = aCI.GetPluginName(); - if (aFileName.IsEmpty() || aLibName.IsEmpty()) + TCollection_AsciiString aFileName = aCI.GetFileName(); + TCollection_AsciiString aFormatName = aCI.GetFormatName(); + TCollection_AsciiString aLibName = aCI.GetPluginName(); + if (aFileName.IsEmpty() || aFormatName.IsEmpty() || aLibName.IsEmpty()) return 0; // load plugin library @@ -105,7 +108,7 @@ Standard_Integer GEOMImpl_ExportDriver::Execute(TFunction_Logbook& log) const return 0; // perform the export - int res = fp( aShape, aFileName ); + int res = fp( aShape, aFileName, aFormatName ); // unload plugin library UnLoadLib( anExportLib ); diff --git a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx index 0d46a94ac..307df2424 100644 --- a/src/GEOMImpl/GEOMImpl_ExportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ExportDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_ExportDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx index 3dbe9a461..dcebfc630 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx index 5f9a6d2d1..22a5baec7 100644 --- a/src/GEOMImpl/GEOMImpl_FilletDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FilletDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_FilletDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx index c9771babe..f37a2176a 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx index a4d46e283..88eb0d8ab 100644 --- a/src/GEOMImpl/GEOMImpl_FillingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_FillingDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_FillingDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_Gen.cxx b/src/GEOMImpl/GEOMImpl_Gen.cxx index 74ebd75c3..ff5d2a26a 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.cxx +++ b/src/GEOMImpl/GEOMImpl_Gen.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WNT #pragma warning( disable:4786 ) @@ -48,6 +48,7 @@ #include #include #include +#include #include #include #include @@ -104,6 +105,7 @@ GEOMImpl_Gen::GEOMImpl_Gen() TFunction_DriverTable::Get()->AddDriver(GEOMImpl_CylinderDriver::GetID(), new GEOMImpl_CylinderDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PrismDriver::GetID(), new GEOMImpl_PrismDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_PipeDriver::GetID(), new GEOMImpl_PipeDriver()); + TFunction_DriverTable::Get()->AddDriver(GEOMImpl_ThruSectionsDriver::GetID(), new GEOMImpl_ThruSectionsDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_RevolutionDriver::GetID(), new GEOMImpl_RevolutionDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_SphereDriver::GetID(), new GEOMImpl_SphereDriver()); TFunction_DriverTable::Get()->AddDriver(GEOMImpl_TorusDriver::GetID(), new GEOMImpl_TorusDriver()); diff --git a/src/GEOMImpl/GEOMImpl_Gen.hxx b/src/GEOMImpl/GEOMImpl_Gen.hxx index 0a7cd3673..f1a22a785 100644 --- a/src/GEOMImpl/GEOMImpl_Gen.hxx +++ b/src/GEOMImpl/GEOMImpl_Gen.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_GEN_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx index d8697f8bc..fd41180a9 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx index aaf8fae49..3c78c7bc8 100644 --- a/src/GEOMImpl/GEOMImpl_GlueDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_GlueDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_GlueDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx index 251a0a6c8..ffe05748e 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx index eccf0acdc..aa1086b51 100644 --- a/src/GEOMImpl/GEOMImpl_HealingDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_HealingDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_HealingDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx index 266e4de26..1fd9e6a5b 100644 --- a/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_I3DPrimOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -45,6 +45,7 @@ #include #include #include +#include #include #include @@ -56,6 +57,8 @@ #include #include #include +#include +#include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC @@ -933,3 +936,242 @@ Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeFilling SetErrorCode(OK); return aFilling; } + +//============================================================================= +/*! + * MakeThruSections + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_I3DPrimOperations::MakeThruSections( + const Handle(TColStd_HSequenceOfTransient)& theSeqSections, + bool theModeSolid, + double thePreci, + bool theRuled) +{ + Handle(GEOM_Object) anObj; + SetErrorCode(KO); + if(theSeqSections.IsNull()) + return anObj; + + Standard_Integer nbObj = theSeqSections->Length(); + if (!nbObj) + return anObj; + + //Add a new ThruSections object + Handle(GEOM_Object) aThruSect = GetEngine()->AddObject(GetDocID(), GEOM_THRUSECTIONS); + + + //Add a new ThruSections function + + int aTypeFunc = (theRuled ? THRUSECTIONS_RULED : THRUSECTIONS_SMOOTHED); + Handle(GEOM_Function) aFunction = + aThruSect->AddFunction(GEOMImpl_ThruSectionsDriver::GetID(), aTypeFunc); + if (aFunction.IsNull()) return anObj; + + //Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_ThruSectionsDriver::GetID()) return NULL; + + GEOMImpl_IThruSections aCI (aFunction); + + Handle(TColStd_HSequenceOfTransient) aSeqSections = new TColStd_HSequenceOfTransient; + + Standard_Integer i =1; + for( ; i <= nbObj; i++) { + + Handle(Standard_Transient) anItem = theSeqSections->Value(i); + if(anItem.IsNull()) + continue; + + Handle(GEOM_Object) aSectObj = Handle(GEOM_Object)::DownCast(anItem); + if(!aSectObj.IsNull()) + { + Handle(GEOM_Function) aRefSect = aSectObj->GetLastFunction(); + if(!aRefSect.IsNull()) + aSeqSections->Append(aRefSect); + } + } + + if(!aSeqSections->Length()) + return anObj; + + aCI.SetSections(aSeqSections); + aCI.SetSolidMode(theModeSolid); + aCI.SetPrecision(thePreci); + + //Compute the ThruSections value + try { + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("ThruSections driver failed"); + return anObj; + } + } + catch (Standard_Failure) { + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + SetErrorCode(aFail->GetMessageString()); + return anObj; + } + + //Make a Python command + GEOM::TPythonDump pyDump(aFunction); + pyDump << aThruSect << " = geompy.MakeThruSections(["; + + for(i =1 ; i <= nbObj; i++) { + + Handle(Standard_Transient) anItem = theSeqSections->Value(i); + if(anItem.IsNull()) + continue; + + Handle(GEOM_Object) aSectObj = Handle(GEOM_Object)::DownCast(anItem); + if(!aSectObj.IsNull()) { + pyDump<< aSectObj; + if(i < nbObj) + pyDump<<", "; + } + } + + pyDump<< "],"<Length(); + + if (!nbBases) + return anObj; + + Standard_Integer nbLocs = (theLocations.IsNull() ? 0 :theLocations->Length()); + //Add a new Pipe object + Handle(GEOM_Object) aPipeDS = GetEngine()->AddObject(GetDocID(), GEOM_PIPE); + + //Add a new Pipe function + + Handle(GEOM_Function) aFunction = + aPipeDS->AddFunction(GEOMImpl_PipeDriver::GetID(), PIPE_DIFFERENT_SECTIONS); + if (aFunction.IsNull()) return anObj; + + //Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_PipeDriver::GetID()) return anObj; + + GEOMImpl_IPipeDiffSect aCI (aFunction); + + Handle(GEOM_Function) aRefPath = thePath->GetLastFunction(); + if(aRefPath.IsNull()) + return anObj; + + Handle(TColStd_HSequenceOfTransient) aSeqBases = new TColStd_HSequenceOfTransient; + Handle(TColStd_HSequenceOfTransient) aSeqLocs = new TColStd_HSequenceOfTransient; + + Standard_Integer i =1; + for( ; i <= nbBases; i++) { + + Handle(Standard_Transient) anItem = theBases->Value(i); + if(anItem.IsNull()) + continue; + + Handle(GEOM_Object) aBase = Handle(GEOM_Object)::DownCast(anItem); + if(aBase.IsNull()) + continue; + Handle(GEOM_Function) aRefBase = aBase->GetLastFunction(); + if(aRefBase.IsNull()) + continue; + if(nbLocs) + { + Handle(Standard_Transient) anItemLoc = theLocations->Value(i); + if(anItemLoc.IsNull()) + continue; + + Handle(GEOM_Object) aLoc = Handle(GEOM_Object)::DownCast(anItemLoc); + if(aLoc.IsNull()) + continue; + Handle(GEOM_Function) aRefLoc = aLoc->GetLastFunction(); + if(aRefLoc.IsNull()) + continue; + aSeqLocs->Append(aRefLoc); + } + aSeqBases->Append(aRefBase); + } + + if(!aSeqBases->Length()) + return anObj; + + aCI.SetBases(aSeqBases); + aCI.SetLocations(aSeqLocs); + aCI.SetPath(aRefPath); + aCI.SetWithContactMode(theWithContact); + aCI.SetWithCorrectionMode(theWithCorrections); + + //Compute the Pipe value + try { + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("Pipe with defferent section driver failed"); + return anObj; + } + } + catch (Standard_Failure) { + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + SetErrorCode(aFail->GetMessageString()); + return anObj; + } + + //Make a Python command + GEOM::TPythonDump pyDump(aFunction); + pyDump << aPipeDS << " = geompy.MakePipeWithDifferentSections(["; + + for(i =1 ; i <= nbBases; i++) { + + Handle(Standard_Transient) anItem = theBases->Value(i); + if(anItem.IsNull()) + continue; + + Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(anItem); + if(!anObj.IsNull()) { + pyDump<< anObj; + if(i < nbBases) + pyDump<<", "; + } + + } + + pyDump<< "], ["; + + for(i =1 ; i <= nbLocs; i++) { + + Handle(Standard_Transient) anItem = theLocations->Value(i); + if(anItem.IsNull()) + continue; + + Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast(anItem); + if(!anObj.IsNull()) { + pyDump<< anObj; + if(i < nbLocs) + pyDump<<", "; + } + } + + pyDump<< "], "< +#include class GEOMImpl_I3DPrimOperations : public GEOM_IOperations { public: @@ -73,6 +74,17 @@ class GEOMImpl_I3DPrimOperations : public GEOM_IOperations { Standard_EXPORT Handle(GEOM_Object) MakeFilling (Handle(GEOM_Object) theShape, int theMinDeg, int theMaxDeg, double theTol2D, double theTol3D, int theNbIter); + Standard_EXPORT Handle(GEOM_Object) MakeThruSections(const Handle(TColStd_HSequenceOfTransient)& theSeqSections, + bool theModeSolid, + double thePreci, + bool theRuled); + + Standard_EXPORT Handle(GEOM_Object) MakePipeWithDifferentSections( + const Handle(TColStd_HSequenceOfTransient)& theBases, + const Handle(TColStd_HSequenceOfTransient)& theLocations, + const Handle(GEOM_Object)& thePath, + bool theWithContact, + bool theWithCorrections); }; #endif diff --git a/src/GEOMImpl/GEOMImpl_IArc.hxx b/src/GEOMImpl/GEOMImpl_IArc.hxx index 6ad13ca56..3c41b4c74 100644 --- a/src/GEOMImpl/GEOMImpl_IArc.hxx +++ b/src/GEOMImpl/GEOMImpl_IArc.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Arc creation. diff --git a/src/GEOMImpl/GEOMImpl_IArchimede.hxx b/src/GEOMImpl/GEOMImpl_IArchimede.hxx index bf504973e..ca31fa31b 100644 --- a/src/GEOMImpl/GEOMImpl_IArchimede.hxx +++ b/src/GEOMImpl/GEOMImpl_IArchimede.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Archimede operation. diff --git a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx index 9a7ba439c..917ad2c25 100644 --- a/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBasicOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -221,6 +221,55 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakePointOnCurve return aPoint; } +//============================================================================= +/*! + * MakeTangentOnCurve + */ +//============================================================================= +Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeTangentOnCurve + (const Handle(GEOM_Object)& theCurve, double theParameter) +{ + SetErrorCode(KO); + + if (theCurve.IsNull()) return NULL; + + //Add a new Vector object + Handle(GEOM_Object) aVec = GetEngine()->AddObject(GetDocID(), GEOM_VECTOR); + + //Add a new Point function for creation a point relativley another point + Handle(GEOM_Function) aFunction = aVec->AddFunction(GEOMImpl_VectorDriver::GetID(), VECTOR_TANGENT_CURVE_PAR); + + //Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_VectorDriver::GetID()) return NULL; + + GEOMImpl_IVector aVI (aFunction); + + Handle(GEOM_Function) aRefFunction = theCurve->GetLastFunction(); + if (aRefFunction.IsNull()) return NULL; + + aVI.SetCurve(aRefFunction); + aVI.SetParameter(theParameter); + + //Compute the vector value + try { + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("Vector driver failed"); + return NULL; + } + } + catch (Standard_Failure) { + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + SetErrorCode(aFail->GetMessageString()); + return NULL; + } + + //Make a Python command + GEOM::TPythonDump(aFunction) << aVec << " = geompy.MakeTangentOnCurve(" + << theCurve << ", " << theParameter << ")"; + + SetErrorCode(OK); + return aVec; +} //============================================================================= /*! @@ -641,3 +690,61 @@ Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeMarker SetErrorCode(OK); return aMarker; } + +//============================================================================= +/*! + * MakeTangentPlaneOnFace + */ +//============================================================================= + +Handle(GEOM_Object) GEOMImpl_IBasicOperations::MakeTangentPlaneOnFace(const Handle(GEOM_Object)& theFace, + double theParamU, + double theParamV, + double theSize) +{ + SetErrorCode(KO); + + if (theFace.IsNull()) return NULL; + + //Add a new Plane object + Handle(GEOM_Object) aPlane = GetEngine()->AddObject(GetDocID(), GEOM_PLANE); + + //Add a new Plane function + Handle(GEOM_Function) aFunction = + aPlane->AddFunction(GEOMImpl_PlaneDriver::GetID(), PLANE_TANGENT_FACE); + + //Check if the function is set correctly + if (aFunction->GetDriverGUID() != GEOMImpl_PlaneDriver::GetID()) return NULL; + + GEOMImpl_IPlane aPI (aFunction); + + Handle(GEOM_Function) aRef = theFace->GetLastFunction(); + if (aRef.IsNull()) return NULL; + + aPI.SetFace(aRef); + aPI.SetSize(theSize); + aPI.SetParameterU(theParamU); + aPI.SetParameterV(theParamV); + + //Compute the Plane value + try { + if (!GetSolver()->ComputeFunction(aFunction)) { + SetErrorCode("Plane driver failed"); + return NULL; + } + } + catch (Standard_Failure) { + Handle(Standard_Failure) aFail = Standard_Failure::Caught(); + SetErrorCode(aFail->GetMessageString()); + return NULL; + } + + //Make a Python command + GEOM::TPythonDump(aFunction) << aPlane << " = geompy.MakeTangentPlaneOnFace(" + << theFace << ", " <GetLastFunction(); - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); //Make a Python command - GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t" + GEOM::TPythonDump(aFunction, /*append=*/true) << aResult << " = geompy.GetPoint(" << theShape << ", " - << theX << ", " << theY << ", " << theZ << ", " << theEpsilon << ")"; + << theX << ", " << theY << ", " << theZ << ", " << theEpsilon << ")"; SetErrorCode(OK); return aResult; @@ -2447,12 +2446,11 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IBlocksOperations::ExplodeCompound //The explode doesn't change object so no new function is required. aFunction = theCompound->GetLastFunction(); - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); //Make a Python command - GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t[" - << anAsciiList.ToCString() << "] = geompy.MakeBlockExplode(" - << theCompound << ", " << theMinNbFaces << ", " << theMaxNbFaces << ")"; + GEOM::TPythonDump(aFunction, /*append=*/true) + << "[" << anAsciiList.ToCString() << "] = geompy.MakeBlockExplode(" + << theCompound << ", " << theMinNbFaces << ", " << theMaxNbFaces << ")"; SetErrorCode(OK); return aBlocks; @@ -3118,11 +3116,10 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IBlocksOperations::Propagate // The Propagation doesn't change object so no new function is required. Handle(GEOM_Function) aFunction = theShape->GetLastFunction(); - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); // Make a Python command - GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t[" - << aListRes.ToCString() << "] = geompy.Propagate(" << theShape << ")"; + GEOM::TPythonDump(aFunction, /*append=*/true) + << "[" << aListRes.ToCString() << "] = geompy.Propagate(" << theShape << ")"; SetErrorCode(OK); return aSeq; diff --git a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx index 4b43078dc..9b8414308 100644 --- a/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBlocksOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_IBlocksOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IBoolean.hxx b/src/GEOMImpl/GEOMImpl_IBoolean.hxx index 62cb8ddb7..302ecfc44 100644 --- a/src/GEOMImpl/GEOMImpl_IBoolean.hxx +++ b/src/GEOMImpl/GEOMImpl_IBoolean.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Common, Cut and Fuse creation. diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx index 65037c7d4..435f80d47 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx index c0d264b45..d0b6e87ca 100644 --- a/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IBooleanOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_IBooleanOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IBox.hxx b/src/GEOMImpl/GEOMImpl_IBox.hxx index 2cffca44b..7ce2152a8 100644 --- a/src/GEOMImpl/GEOMImpl_IBox.hxx +++ b/src/GEOMImpl/GEOMImpl_IBox.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Box creation. diff --git a/src/GEOMImpl/GEOMImpl_IChamfer.hxx b/src/GEOMImpl/GEOMImpl_IChamfer.hxx index 13c62df6f..6c12fd184 100644 --- a/src/GEOMImpl/GEOMImpl_IChamfer.hxx +++ b/src/GEOMImpl/GEOMImpl_IChamfer.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an interface to a function for the Chamfer and creation. diff --git a/src/GEOMImpl/GEOMImpl_ICircle.hxx b/src/GEOMImpl/GEOMImpl_ICircle.hxx index 892f534fb..ab44ba5d7 100644 --- a/src/GEOMImpl/GEOMImpl_ICircle.hxx +++ b/src/GEOMImpl/GEOMImpl_ICircle.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Circle creation. diff --git a/src/GEOMImpl/GEOMImpl_ICone.hxx b/src/GEOMImpl/GEOMImpl_ICone.hxx index 2ed1c1cdc..bce989a92 100644 --- a/src/GEOMImpl/GEOMImpl_ICone.hxx +++ b/src/GEOMImpl/GEOMImpl_ICone.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Cone creation. diff --git a/src/GEOMImpl/GEOMImpl_ICopy.hxx b/src/GEOMImpl/GEOMImpl_ICopy.hxx index 7f63bdf27..09b9ee001 100644 --- a/src/GEOMImpl/GEOMImpl_ICopy.hxx +++ b/src/GEOMImpl/GEOMImpl_ICopy.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Copy operation. diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx index e6162262b..c498996ef 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx index 9673f68cc..0d6dbe97c 100644 --- a/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ICurvesOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // using namespace std; diff --git a/src/GEOMImpl/GEOMImpl_ICylinder.hxx b/src/GEOMImpl/GEOMImpl_ICylinder.hxx index 91c3f0540..e71b4f5d5 100644 --- a/src/GEOMImpl/GEOMImpl_ICylinder.hxx +++ b/src/GEOMImpl/GEOMImpl_ICylinder.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Cylinder creation. diff --git a/src/GEOMImpl/GEOMImpl_IEllipse.hxx b/src/GEOMImpl/GEOMImpl_IEllipse.hxx index 1c6060ed7..a87713518 100644 --- a/src/GEOMImpl/GEOMImpl_IEllipse.hxx +++ b/src/GEOMImpl/GEOMImpl_IEllipse.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Ellipse creation. diff --git a/src/GEOMImpl/GEOMImpl_IFillet.hxx b/src/GEOMImpl/GEOMImpl_IFillet.hxx index 2bd5df2d3..703c0f74f 100644 --- a/src/GEOMImpl/GEOMImpl_IFillet.hxx +++ b/src/GEOMImpl/GEOMImpl_IFillet.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an interface to a function for the Fillet and creation. diff --git a/src/GEOMImpl/GEOMImpl_IFilling.hxx b/src/GEOMImpl/GEOMImpl_IFilling.hxx index 0da183deb..d4269bf19 100644 --- a/src/GEOMImpl/GEOMImpl_IFilling.hxx +++ b/src/GEOMImpl/GEOMImpl_IFilling.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Filling operation. diff --git a/src/GEOMImpl/GEOMImpl_IGlue.hxx b/src/GEOMImpl/GEOMImpl_IGlue.hxx index 9bd419bd0..31d0cd2d4 100644 --- a/src/GEOMImpl/GEOMImpl_IGlue.hxx +++ b/src/GEOMImpl/GEOMImpl_IGlue.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // NOTE: This is an interface to a function for the Glueing of faces diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx index 67b43781f..2693d4c8a 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -75,7 +75,7 @@ GEOMImpl_IGroupOperations::~GEOMImpl_IGroupOperations() */ //============================================================================= Handle(GEOM_Object) GEOMImpl_IGroupOperations::CreateGroup - (Handle(GEOM_Object) theMainShape, TopAbs_ShapeEnum theShapeType) + (Handle(GEOM_Object) theMainShape, TopAbs_ShapeEnum theShapeType) { SetErrorCode(KO); @@ -94,14 +94,12 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::CreateGroup //Make a Python command Handle(GEOM_Function) aFunction = aGroup->GetFunction(1); - //TCollection_AsciiString anOldDescr = aFunction->GetDescription(); - //GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t" << aGroup GEOM::TPythonDump(aFunction) << aGroup - << " = geompy.CreateGroup(" << theMainShape << ", " << (int)theShapeType << ")"; + << " = geompy.CreateGroup(" << theMainShape << ", " << theShapeType << ")"; SetErrorCode(OK); - return aGroup; + return aGroup; } //============================================================================= @@ -156,9 +154,7 @@ void GEOMImpl_IGroupOperations::AddObject(Handle(GEOM_Object) theGroup, int theS } //Make a Python command - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); - - GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t" + GEOM::TPythonDump(aFunction, /*append=*/true) << "geompy.AddObject(" << theGroup << ", " << theSubShapeID << ")"; SetErrorCode(OK); @@ -222,9 +218,7 @@ void GEOMImpl_IGroupOperations::RemoveObject (Handle(GEOM_Object) theGroup, int } //Make a Python command - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); - - GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() << "\n\t" + GEOM::TPythonDump(aFunction, /*append=*/true) << "geompy.RemoveObject(" << theGroup << ", " << theSubShapeID << ")"; SetErrorCode(OK); @@ -242,6 +236,12 @@ void GEOMImpl_IGroupOperations::UnionList (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + SetErrorCode("The list is empty"); + return; + } + Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); if (aFunction.IsNull()) return; @@ -277,7 +277,7 @@ void GEOMImpl_IGroupOperations::UnionList (Handle(GEOM_Object) theGroup, TopExp::MapShapes(aMainShape, mapIndices); // Get IDs of sub-shapes to add - Standard_Integer i, new_id, aLen = theSubShapes->Length(); + Standard_Integer i, new_id; for (i = 1; i <= aLen; i++) { Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); @@ -363,11 +363,13 @@ void GEOMImpl_IGroupOperations::UnionList (Handle(GEOM_Object) theGroup, aSSI.SetIndices(aNewSeq); } - //Make a Python command - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); + //Make a Python command + Handle(GEOM_Object) aLatest = GEOM::GetCreatedLast(theSubShapes); + aLatest = GEOM::GetCreatedLast(aLatest, theGroup); + Handle(GEOM_Function) aLastFunc = aLatest->GetLastFunction(); - GEOM::TPythonDump pd (aFunction); - pd << anOldDescr.ToCString() << "\n\t" << "geompy.UnionList(" << theGroup << ", ["; + GEOM::TPythonDump pd (aLastFunc, /*append=*/true); + pd << "geompy.UnionList(" << theGroup << ", ["; for (i = 1; i <= aLen; i++) { Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); @@ -388,6 +390,12 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + SetErrorCode("The list is empty"); + return; + } + Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); if (aFunction.IsNull()) return; @@ -424,7 +432,7 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, TopExp::MapShapes(aMainShape, mapIndices); // Get IDs of sub-shapes to be removed - Standard_Integer i, rem_id, aLen = theSubShapes->Length(); + Standard_Integer i, rem_id; for (i = 1; i <= aLen; i++) { Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); @@ -514,10 +522,12 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, } //Make a Python command - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); + Handle(GEOM_Object) aLatest = GEOM::GetCreatedLast(theSubShapes); + aLatest = GEOM::GetCreatedLast(aLatest, theGroup); + Handle(GEOM_Function) aLastFunc = aLatest->GetLastFunction(); - GEOM::TPythonDump pd (aFunction); - pd << anOldDescr.ToCString() << "\n\t" << "geompy.DifferenceList(" << theGroup << ", ["; + GEOM::TPythonDump pd (aLastFunc, /*append=*/true); + pd << "geompy.DifferenceList(" << theGroup << ", ["; for (i = 1; i <= aLen; i++) { Handle(GEOM_Object) anObj_i = Handle(GEOM_Object)::DownCast(theSubShapes->Value(i)); @@ -526,6 +536,7 @@ void GEOMImpl_IGroupOperations::DifferenceList (Handle(GEOM_Object) theGroup, SetErrorCode(OK); } + //============================================================================= /*! * UnionIDs @@ -537,6 +548,12 @@ void GEOMImpl_IGroupOperations::UnionIDs (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + SetErrorCode("The list is empty"); + return; + } + Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); if (aFunction.IsNull()) return; @@ -572,7 +589,7 @@ void GEOMImpl_IGroupOperations::UnionIDs (Handle(GEOM_Object) theGroup, TopExp::MapShapes(aMainShape, mapIndices); // Get IDs of sub-shapes to add - Standard_Integer i, new_id, aLen = theSubShapes->Length(); + Standard_Integer i, new_id; for (i = 1; i <= aLen; i++) { new_id = theSubShapes->Value(i); @@ -594,6 +611,13 @@ void GEOMImpl_IGroupOperations::UnionIDs (Handle(GEOM_Object) theGroup, aSSI.SetIndices(aNewSeq); } + //Make a Python command + GEOM::TPythonDump pd (aFunction, /*append=*/true); + pd << "geompy.UnionIDs(" << theGroup << ", ["; + for (i = 1; i < aLen; i++) + pd << theSubShapes->Value(i) << ", "; + pd << theSubShapes->Value(aLen) << "])"; + SetErrorCode(OK); } @@ -608,6 +632,12 @@ void GEOMImpl_IGroupOperations::DifferenceIDs (Handle(GEOM_Object) theGroup, SetErrorCode(KO); if (theGroup.IsNull()) return; + Standard_Integer aLen = theSubShapes->Length(); + if (aLen < 1) { + SetErrorCode("The list is empty"); + return; + } + Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); if (aFunction.IsNull()) return; @@ -644,7 +674,7 @@ void GEOMImpl_IGroupOperations::DifferenceIDs (Handle(GEOM_Object) theGroup, TopExp::MapShapes(aMainShape, mapIndices); // Get IDs of sub-shapes to be removed - Standard_Integer i, rem_id, aLen = theSubShapes->Length(); + Standard_Integer i, rem_id; for (i = 1; i <= aLen; i++) { rem_id = theSubShapes->Value(i); if (mapIDsCurrent.Contains(rem_id)) { @@ -666,6 +696,13 @@ void GEOMImpl_IGroupOperations::DifferenceIDs (Handle(GEOM_Object) theGroup, aSSI.SetIndices(aNewSeq); } + //Make a Python command + GEOM::TPythonDump pd (aFunction, /*append=*/true); + pd << "geompy.DifferenceIDs(" << theGroup << ", ["; + for (i = 1; i < aLen; i++) + pd << theSubShapes->Value(i) << ", "; + pd << theSubShapes->Value(aLen) << "])"; + SetErrorCode(OK); } @@ -709,9 +746,7 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::GetMainShape (Handle(GEOM_Object) if (aMainShape.IsNull()) return NULL; //Make a Python command - TCollection_AsciiString anOldDescr = aGroupFunction->GetDescription(); - - GEOM::TPythonDump(aGroupFunction) << anOldDescr.ToCString() << "\n\t" + GEOM::TPythonDump(aGroupFunction, /*append=*/true) << aMainShape << " = geompy.GetMainShape(" << theGroup << ")"; SetErrorCode(OK); @@ -726,12 +761,12 @@ Handle(GEOM_Object) GEOMImpl_IGroupOperations::GetMainShape (Handle(GEOM_Object) Handle(TColStd_HArray1OfInteger) GEOMImpl_IGroupOperations::GetObjects(Handle(GEOM_Object) theGroup) { SetErrorCode(KO); - - if(theGroup.IsNull()) return NULL; + + if(theGroup.IsNull()) return NULL; Handle(GEOM_Function) aFunction = theGroup->GetFunction(1); if(aFunction.IsNull()) return NULL; - + GEOM_ISubShape aSSI(aFunction); Handle(TColStd_HArray1OfInteger) aSeq = aSSI.GetIndices(); if(aSeq.IsNull()) return NULL; diff --git a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx index 48a1f2ebc..9629b5912 100644 --- a/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IGroupOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_IGroupOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IHealing.hxx b/src/GEOMImpl/GEOMImpl_IHealing.hxx index 81d69281a..8e52151ca 100755 --- a/src/GEOMImpl/GEOMImpl_IHealing.hxx +++ b/src/GEOMImpl/GEOMImpl_IHealing.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Healing creation. diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx index 3bd88274f..1d3d9f420 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WNT #pragma warning( disable:4786 ) diff --git a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx index cdb1ceae6..1a7359374 100644 --- a/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IHealingOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_IHealingOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IImportExport.hxx b/src/GEOMImpl/GEOMImpl_IImportExport.hxx index efa6b2bec..3ead28531 100644 --- a/src/GEOMImpl/GEOMImpl_IImportExport.hxx +++ b/src/GEOMImpl/GEOMImpl_IImportExport.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Import Export operation. @@ -25,6 +25,7 @@ #define EXP_ARG_REF 1 #define EXP_ARG_FILE 2 #define EXP_ARG_PLUG 3 +#define EXP_ARG_FORM 4 class GEOMImpl_IImportExport { @@ -36,15 +37,21 @@ class GEOMImpl_IImportExport Handle(GEOM_Function) GetOriginal() { return _func->GetReference(EXP_ARG_REF); } - void SetFileName(const TCollection_AsciiString& theFileName) { _func->SetString(EXP_ARG_FILE, theFileName); } + void SetFileName(const TCollection_AsciiString& theFileName) + { _func->SetString(EXP_ARG_FILE, theFileName); } TCollection_AsciiString GetFileName() { return _func->GetString(EXP_ARG_FILE); } - void SetPluginName(const TCollection_AsciiString& theFormatName) - { _func->SetString(EXP_ARG_PLUG, theFormatName); } + void SetPluginName(const TCollection_AsciiString& thePluginLibName) + { _func->SetString(EXP_ARG_PLUG, thePluginLibName); } TCollection_AsciiString GetPluginName() { return _func->GetString(EXP_ARG_PLUG); } + void SetFormatName(const TCollection_AsciiString& theFormatName) + { _func->SetString(EXP_ARG_FORM, theFormatName); } + + TCollection_AsciiString GetFormatName() { return _func->GetString(EXP_ARG_FORM); } + private: Handle(GEOM_Function) _func; diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index 8e12231cf..ec850804c 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -140,16 +140,17 @@ void GEOMImpl_IInsertOperations::Export //Check if the function is set correctly if (aFunction->GetDriverGUID() != GEOMImpl_ExportDriver::GetID()) return; - //Set parameters - GEOMImpl_IImportExport aCI (aFunction); - aCI.SetOriginal(aRefFunction); - aCI.SetFileName(theFileName); - Handle(TCollection_HAsciiString) aHLibName; if (!IsSupported(Standard_False, theFormatName, aHLibName)) { return; } TCollection_AsciiString aLibName = aHLibName->String(); + + //Set parameters + GEOMImpl_IImportExport aCI (aFunction); + aCI.SetOriginal(aRefFunction); + aCI.SetFileName(theFileName); + aCI.SetFormatName(theFormatName); aCI.SetPluginName(aLibName); //Perform the Export @@ -195,15 +196,16 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import //Check if the function is set correctly if (aFunction->GetDriverGUID() != GEOMImpl_ImportDriver::GetID()) return result; - //Set parameters - GEOMImpl_IImportExport aCI (aFunction); - aCI.SetFileName(theFileName); - Handle(TCollection_HAsciiString) aHLibName; if (!IsSupported(Standard_True, theFormatName, aHLibName)) { return result; } TCollection_AsciiString aLibName = aHLibName->String(); + + //Set parameters + GEOMImpl_IImportExport aCI (aFunction); + aCI.SetFileName(theFileName); + aCI.SetFormatName(theFormatName); aCI.SetPluginName(aLibName); //Perform the Import @@ -261,14 +263,18 @@ Standard_Boolean GEOMImpl_IInsertOperations::ImportTranslators // Read Patterns for each supported format int j = 1, len = theFormats->Length(); for (; j <= len; j++) { - TCollection_AsciiString aPattern; - TCollection_AsciiString aKey (theFormats->Value(j)); - aKey += ".Pattern"; + TCollection_AsciiString aKey, aPattern; + aKey = theFormats->Value(j) + ".ImportPattern"; if (myResMgr->Find(aKey.ToCString())) aPattern = myResMgr->Value(aKey.ToCString()); else { - aPattern = theFormats->Value(j); - aPattern += " Files ( *.* )"; + aKey = theFormats->Value(j) + ".Pattern"; + if (myResMgr->Find(aKey.ToCString())) + aPattern = myResMgr->Value(aKey.ToCString()); + else { + aPattern = theFormats->Value(j); + aPattern += " Files ( *.* )"; + } } thePatterns->Append(aPattern); } @@ -310,14 +316,18 @@ Standard_Boolean GEOMImpl_IInsertOperations::ExportTranslators // Read Patterns for each supported format int j = 1, len = theFormats->Length(); for (; j <= len; j++) { - TCollection_AsciiString aPattern; - TCollection_AsciiString aKey (theFormats->Value(j)); - aKey += ".Pattern"; + TCollection_AsciiString aKey, aPattern; + aKey = theFormats->Value(j) + ".ExportPattern"; if (myResMgr->Find(aKey.ToCString())) aPattern = myResMgr->Value(aKey.ToCString()); else { - aPattern = theFormats->Value(j); - aPattern += " Files ( *.* )"; + aKey = theFormats->Value(j) + ".Pattern"; + if (myResMgr->Find(aKey.ToCString())) + aPattern = myResMgr->Value(aKey.ToCString()); + else { + aPattern = theFormats->Value(j); + aPattern += " Files ( *.* )"; + } } thePatterns->Append(aPattern); } diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx index 795b3ae93..5a5148b1a 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_IInsertOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_ILine.hxx b/src/GEOMImpl/GEOMImpl_ILine.hxx index fd9f108f8..09d5fba74 100644 --- a/src/GEOMImpl/GEOMImpl_ILine.hxx +++ b/src/GEOMImpl/GEOMImpl_ILine.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the vector creation. diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx index c6f85f04a..96bb393b5 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -35,6 +35,9 @@ #include #include +#include +#include + #include "utilities.h" #include #include @@ -509,17 +512,17 @@ Standard_Integer GEOMImpl_ILocalOperations::GetSubShapeIndex (Handle(GEOM_Object { SetErrorCode(KO); - TopoDS_Shape aShape = theShape->GetValue(); - TopoDS_Shape aSubShape = theSubShape->GetValue(); - - if (aShape.IsNull() || aSubShape.IsNull()) return -1; + Standard_Integer anInd = -1; + GEOM_Engine* anEngine = GetEngine(); + //GEOMImpl_Gen* aGen = dynamic_cast(anEngine); + GEOMImpl_Gen* aGen = (GEOMImpl_Gen*)anEngine; - TopTools_IndexedMapOfShape anIndices; - TopExp::MapShapes(aShape, anIndices); - if (anIndices.Contains(aSubShape)) { - SetErrorCode(OK); - return anIndices.FindIndex(aSubShape); + if (aGen) { + GEOMImpl_IShapesOperations* anIShapesOperations = + aGen->GetIShapesOperations(GetDocID()); + anInd = anIShapesOperations->GetSubShapeIndex(theShape, theSubShape); + SetErrorCode(anIShapesOperations->GetErrorCode()); } - return -1; + return anInd; } diff --git a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx index 9050413e3..a079bc569 100644 --- a/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ILocalOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_ILocalOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IMarker.hxx b/src/GEOMImpl/GEOMImpl_IMarker.hxx index 2e6b157ac..1fa2f49d5 100644 --- a/src/GEOMImpl/GEOMImpl_IMarker.hxx +++ b/src/GEOMImpl/GEOMImpl_IMarker.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an interface to a function for the local coordinate system creation. diff --git a/src/GEOMImpl/GEOMImpl_IMeasure.hxx b/src/GEOMImpl/GEOMImpl_IMeasure.hxx index 32ff00963..80915550b 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasure.hxx +++ b/src/GEOMImpl/GEOMImpl_IMeasure.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // NOTE: This is an interface to a functions for the Measurement diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx index 4cc2facc4..94ecb8458 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx index 541364583..d60ba9153 100644 --- a/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IMeasureOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_IMeasureOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_IMirror.hxx b/src/GEOMImpl/GEOMImpl_IMirror.hxx index 94a00b9fd..4475216a2 100644 --- a/src/GEOMImpl/GEOMImpl_IMirror.hxx +++ b/src/GEOMImpl/GEOMImpl_IMirror.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Mirror creation. diff --git a/src/GEOMImpl/GEOMImpl_IOffset.hxx b/src/GEOMImpl/GEOMImpl_IOffset.hxx index 5eb57cf28..6533324b7 100644 --- a/src/GEOMImpl/GEOMImpl_IOffset.hxx +++ b/src/GEOMImpl/GEOMImpl_IOffset.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Offset creation. diff --git a/src/GEOMImpl/GEOMImpl_IPartition.hxx b/src/GEOMImpl/GEOMImpl_IPartition.hxx index 575f6e6c4..1141f0f0c 100644 --- a/src/GEOMImpl/GEOMImpl_IPartition.hxx +++ b/src/GEOMImpl/GEOMImpl_IPartition.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Partition creation. diff --git a/src/GEOMImpl/GEOMImpl_IPipe.hxx b/src/GEOMImpl/GEOMImpl_IPipe.hxx index 5ed0050b9..7982d8614 100644 --- a/src/GEOMImpl/GEOMImpl_IPipe.hxx +++ b/src/GEOMImpl/GEOMImpl_IPipe.hxx @@ -15,10 +15,12 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Pipe creation. +#ifndef _GEOMImpl_IPIPE_HXX_ +#define _GEOMImpl_IPIPE_HXX_ #include "GEOM_Function.hxx" @@ -37,7 +39,9 @@ class GEOMImpl_IPipe Handle(GEOM_Function) GetBase() { return _func->GetReference(PIPE_ARG_BASE); } Handle(GEOM_Function) GetPath() { return _func->GetReference(PIPE_ARG_PATH); } - private: + protected: Handle(GEOM_Function) _func; }; + +#endif diff --git a/src/GEOMImpl/GEOMImpl_IPlane.hxx b/src/GEOMImpl/GEOMImpl_IPlane.hxx index 5129d6a9d..bf328a80f 100644 --- a/src/GEOMImpl/GEOMImpl_IPlane.hxx +++ b/src/GEOMImpl/GEOMImpl_IPlane.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the vector creation. @@ -32,6 +32,10 @@ #define PLN_ARG_REF 6 +#define PLN_ARG_PARAM_U 7 + +#define PLN_ARG_PARAM_V 8 + class GEOMImpl_IPlane { public: @@ -59,6 +63,12 @@ class GEOMImpl_IPlane Handle(GEOM_Function) GetPoint1() { return _func->GetReference(PLN_ARG_PNT1); } Handle(GEOM_Function) GetPoint2() { return _func->GetReference(PLN_ARG_PNT2); } Handle(GEOM_Function) GetPoint3() { return _func->GetReference(PLN_ARG_PNT3); } + + void SetParameterU(double theParamU) { _func->SetReal(PLN_ARG_PARAM_U, theParamU); } + double GetParameterU() { return _func->GetReal(PLN_ARG_PARAM_U); } + + void SetParameterV(double theParamV) { _func->SetReal(PLN_ARG_PARAM_V, theParamV); } + double GetParameterV() { return _func->GetReal(PLN_ARG_PARAM_V); } private: diff --git a/src/GEOMImpl/GEOMImpl_IPoint.hxx b/src/GEOMImpl/GEOMImpl_IPoint.hxx index 2adb7cfc6..91dd98383 100755 --- a/src/GEOMImpl/GEOMImpl_IPoint.hxx +++ b/src/GEOMImpl/GEOMImpl_IPoint.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the point creation. diff --git a/src/GEOMImpl/GEOMImpl_IPolyline.hxx b/src/GEOMImpl/GEOMImpl_IPolyline.hxx index c76c8a992..800795a4b 100644 --- a/src/GEOMImpl/GEOMImpl_IPolyline.hxx +++ b/src/GEOMImpl/GEOMImpl_IPolyline.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Polyline creation. diff --git a/src/GEOMImpl/GEOMImpl_IPosition.hxx b/src/GEOMImpl/GEOMImpl_IPosition.hxx index 194f6c7ea..77a0e358a 100644 --- a/src/GEOMImpl/GEOMImpl_IPosition.hxx +++ b/src/GEOMImpl/GEOMImpl_IPosition.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Setting In Position. diff --git a/src/GEOMImpl/GEOMImpl_IPrism.hxx b/src/GEOMImpl/GEOMImpl_IPrism.hxx index 7d82753a3..14c01864e 100644 --- a/src/GEOMImpl/GEOMImpl_IPrism.hxx +++ b/src/GEOMImpl/GEOMImpl_IPrism.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Prism creation. diff --git a/src/GEOMImpl/GEOMImpl_IRevolution.hxx b/src/GEOMImpl/GEOMImpl_IRevolution.hxx index 5857361bb..c0d551b34 100644 --- a/src/GEOMImpl/GEOMImpl_IRevolution.hxx +++ b/src/GEOMImpl/GEOMImpl_IRevolution.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Revolution creation. diff --git a/src/GEOMImpl/GEOMImpl_IRotate.hxx b/src/GEOMImpl/GEOMImpl_IRotate.hxx index 44e7cccac..9d09aa487 100644 --- a/src/GEOMImpl/GEOMImpl_IRotate.hxx +++ b/src/GEOMImpl/GEOMImpl_IRotate.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Rotate operation. diff --git a/src/GEOMImpl/GEOMImpl_IScale.hxx b/src/GEOMImpl/GEOMImpl_IScale.hxx index 75df3263b..9a7e904a2 100644 --- a/src/GEOMImpl/GEOMImpl_IScale.hxx +++ b/src/GEOMImpl/GEOMImpl_IScale.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Scale creation. diff --git a/src/GEOMImpl/GEOMImpl_IShapes.hxx b/src/GEOMImpl/GEOMImpl_IShapes.hxx index 61d7fa6f3..25c3796d3 100644 --- a/src/GEOMImpl/GEOMImpl_IShapes.hxx +++ b/src/GEOMImpl/GEOMImpl_IShapes.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // NOTE: This is an intreface to a function for the Shapes // (Wire, Face, Shell, Solid and Compound) creation. diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx index e0d2ae90c..ec50792fa 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -56,6 +56,7 @@ #include #include #include +#include #include #include #include @@ -93,9 +94,6 @@ #include #include -//#include - -//#include #include // CAREFUL ! position of this file is critic : see Lucien PIGNOLONI / OCC @@ -533,9 +531,6 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::MakeExplode const Standard_Integer theShapeType, const Standard_Boolean isSorted) { -// OSD_Timer timer1, timer2, timer3, timer4; -// timer1.Start(); - SetErrorCode(KO); if (theShape.IsNull()) return NULL; @@ -573,15 +568,9 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::MakeExplode return aSeq; } -// timer1.Stop(); -// timer2.Start(); - if (isSorted) SortShapes(listShape); -// timer2.Stop(); -// timer3.Start(); - TopTools_IndexedMapOfShape anIndices; TopExp::MapShapes(aShape, anIndices); Handle(TColStd_HArray1OfInteger) anArray; @@ -605,26 +594,14 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::MakeExplode anAsciiList.Trunc(anAsciiList.Length() - 1); aFunction = theShape->GetLastFunction(); - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); - GEOM::TPythonDump pd (aFunction); - pd << anOldDescr.ToCString() << "\n\t[" << anAsciiList.ToCString(); + GEOM::TPythonDump pd (aFunction, /*append=*/true); + pd << "[" << anAsciiList.ToCString(); pd << "] = geompy.SubShapeAll" << (isSorted ? "Sorted(" : "("); - pd << theShape << ", " << theShapeType << ")"; + pd << theShape << ", " << TopAbs_ShapeEnum(theShapeType) << ")"; SetErrorCode(OK); -// timer4.Stop(); - -// cout << "Explosure takes:" << endl; -// timer1.Show(); -// cout << "Sorting takes:" << endl; -// timer2.Show(); -// cout << "Sub-shapes addition takes:" << endl; -// timer3.Show(); -// cout << "Update Description takes:" << endl; -// timer4.Show(); - return aSeq; } @@ -687,13 +664,12 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::SubShapeAllIDs } Handle(GEOM_Function) aFunction = theShape->GetLastFunction(); - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); //Make a Python command - GEOM::TPythonDump pd (aFunction); - pd << anOldDescr.ToCString() << "\n\tlistSubShapeIDs = geompy.SubShapeAll"; + GEOM::TPythonDump pd (aFunction, /*append=*/true); + pd << "listSubShapeIDs = geompy.SubShapeAll"; pd << (isSorted ? "SortedIDs(" : "IDs("); - pd << theShape << ", " << theShapeType << ")"; + pd << theShape << ", " << TopAbs_ShapeEnum(theShapeType) << ")"; SetErrorCode(OK); return aSeq; @@ -730,6 +706,163 @@ Handle(GEOM_Object) GEOMImpl_IShapesOperations::GetSubShape return anObj; } +//============================================================================= +/*! + * GetSubShapeIndex + */ +//============================================================================= +Standard_Integer GEOMImpl_IShapesOperations::GetSubShapeIndex (Handle(GEOM_Object) theMainShape, + Handle(GEOM_Object) theSubShape) +{ + SetErrorCode(KO); + + TopoDS_Shape aMainShape = theMainShape->GetValue(); + TopoDS_Shape aSubShape = theSubShape->GetValue(); + + if (aMainShape.IsNull() || aSubShape.IsNull()) return -1; + + TopTools_IndexedMapOfShape anIndices; + TopExp::MapShapes(aMainShape, anIndices); + if (anIndices.Contains(aSubShape)) { + SetErrorCode(OK); + return anIndices.FindIndex(aSubShape); + } + + return -1; +} + +//============================================================================= +/*! + * GetTopologyIndex + */ +//============================================================================= +Standard_Integer GEOMImpl_IShapesOperations::GetTopologyIndex (Handle(GEOM_Object) theMainShape, + Handle(GEOM_Object) theSubShape) +{ + SetErrorCode(OK); + + TopoDS_Shape aMainShape = theMainShape->GetValue(); + TopoDS_Shape aSubShape = theSubShape->GetValue(); + + if (aMainShape.IsNull() || aSubShape.IsNull()) { + SetErrorCode("Null argument shape given"); + return -1; + } + + int index = 1; + if (aSubShape.ShapeType() == TopAbs_COMPOUND) { + TopoDS_Iterator it; + TopTools_ListOfShape CL; + CL.Append(aMainShape); + TopTools_ListIteratorOfListOfShape itC; + for (itC.Initialize(CL); itC.More(); itC.Next()) { + for (it.Initialize(itC.Value()); it.More(); it.Next()) { + if (it.Value().ShapeType() == TopAbs_COMPOUND) { + if (it.Value().IsSame(aSubShape)) + return index; + else + index++; + CL.Append(it.Value()); + } + } + } + } else { + TopExp_Explorer anExp (aMainShape, aSubShape.ShapeType()); + TopTools_MapOfShape M; + for (; anExp.More(); anExp.Next()) { + if (M.Add(anExp.Current())) { + if (anExp.Current().IsSame(aSubShape)) + return index; + index++; + } + } + } + + SetErrorCode("The sub-shape does not belong to the main shape"); + return -1; +} + +//============================================================================= +/*! + * GetShapeTypeString + */ +//============================================================================= +TCollection_AsciiString GEOMImpl_IShapesOperations::GetShapeTypeString (Handle(GEOM_Object) theShape) +{ + SetErrorCode(KO); + + TCollection_AsciiString aTypeName ("Null Shape"); + + TopoDS_Shape aShape = theShape->GetValue(); + if (aShape.IsNull()) + return aTypeName; + + switch (aShape.ShapeType() ) + { + case TopAbs_COMPOUND: + aTypeName = "Compound"; + break; + case TopAbs_COMPSOLID: + aTypeName = "Compound Solid"; + break; + case TopAbs_SOLID: + aTypeName = "Solid"; + break; + case TopAbs_SHELL: + aTypeName = "Shell"; + break; + case TopAbs_FACE: + { + BRepAdaptor_Surface surf (TopoDS::Face(aShape)); + if (surf.GetType() == GeomAbs_Plane) + aTypeName = "Plane"; + else if (surf.GetType() == GeomAbs_Cylinder) + aTypeName = "Cylindrical Face"; + else if (surf.GetType() == GeomAbs_Sphere) + aTypeName = "Spherical Face"; + else if (surf.GetType() == GeomAbs_Torus) + aTypeName = "Toroidal Face"; + else if (surf.GetType() == GeomAbs_Cone) + aTypeName = "Conical Face"; + else + aTypeName = "GEOM::FACE"; + } + break; + case TopAbs_WIRE: + aTypeName = "Wire"; + break; + case TopAbs_EDGE: + { + BRepAdaptor_Curve curv (TopoDS::Edge(aShape)); + if (curv.GetType() == GeomAbs_Line) { + if ((Abs(curv.FirstParameter()) >= 1E6) || + (Abs(curv.LastParameter()) >= 1E6)) + aTypeName = "Line"; + else + aTypeName = "Edge" ; + } else if (curv.GetType() == GeomAbs_Circle) { + if (curv.IsClosed()) + aTypeName = "Circle"; + else + aTypeName = "Arc"; + } else { + aTypeName = "Edge"; + } + } + break; + case TopAbs_VERTEX: + aTypeName = "Vertex"; + break; + case TopAbs_SHAPE: + aTypeName = "Shape"; + break; + default: + aTypeName = "Shape of unknown type"; + } + + return aTypeName; +} + //============================================================================= /*! @@ -873,11 +1006,10 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetFreeFacesIDs //The explode doesn't change object so no new function is required. Handle(GEOM_Function) aFunction = theShape->GetLastFunction(); - TCollection_AsciiString anOldDescr = aFunction->GetDescription(); //Make a Python command - GEOM::TPythonDump(aFunction) << anOldDescr.ToCString() - << "\n\tlistFreeFacesIDs = geompy.GetFreeFacesIDs(" << theShape << ")"; + GEOM::TPythonDump(aFunction, /*append=*/true) + << "listFreeFacesIDs = geompy.GetFreeFacesIDs(" << theShape << ")"; SetErrorCode(OK); return aSeq; @@ -942,7 +1074,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetSharedShapes GEOM::TPythonDump(aFunction) << "[" << anAsciiList.ToCString() << "] = geompy.GetSharedShapes(" << theShape1 << ", " - << theShape2 << ", " << theShapeType << ")"; + << theShape2 << ", " << TopAbs_ShapeEnum(theShapeType) << ")"; SetErrorCode(OK); return aSeq; @@ -1084,9 +1216,6 @@ Handle(TColStd_HSequenceOfInteger) GEOMAlgo_State theState) { Handle(TColStd_HSequenceOfInteger) aSeqOfIDs; -// MESSAGE("--------------------------- GetShapesOnPlane phase 1 takes:"); -// OSD_Timer timer1; -// timer1.Start(); // Check presence of triangulation, build if need if (!CheckTriangulation(theShape)) @@ -1112,19 +1241,7 @@ Handle(TColStd_HSequenceOfInteger) // Default value=0 aFinder.SetNbPntsMax(100); -// timer1.Stop(); -// timer1.Show(); - -// MESSAGE("--------------------------- Perform on Plane takes:"); -// timer1.Reset(); -// timer1.Start(); aFinder.Perform(); -// timer1.Stop(); -// timer1.Show(); - -// MESSAGE("--------------------------- GetShapesOnPlane phase 3 takes:"); -// timer1.Reset(); -// timer1.Start(); // Interprete results Standard_Integer iErr = aFinder.ErrorStatus(); @@ -1149,13 +1266,6 @@ Handle(TColStd_HSequenceOfInteger) return aSeqOfIDs; } -// timer1.Stop(); -// timer1.Show(); - -// MESSAGE("--------------------------- GetShapesOnPlane phase 4 takes:"); -// timer1.Reset(); -// timer1.Start(); - // Fill sequence of object IDs aSeqOfIDs = new TColStd_HSequenceOfInteger; @@ -1167,8 +1277,7 @@ Handle(TColStd_HSequenceOfInteger) int id = anIndices.FindIndex(itSub.Value()); aSeqOfIDs->Append(id); } -// timer1.Stop(); -// timer1.Show(); + return aSeqOfIDs; } @@ -1250,10 +1359,6 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetShapesOnPlan { SetErrorCode(KO); -// MESSAGE("--------------------------- GetShapesOnPlane phase 1 takes:"); -// OSD_Timer timer1; -// timer1.Start(); - if (theShape.IsNull() || theAx1.IsNull()) return NULL; TopoDS_Shape aShape = theShape->GetValue(); @@ -1277,13 +1382,6 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetShapesOnPlan if ( aSeq.IsNull() || aSeq->Length() == 0 ) return NULL; -// timer1.Stop(); -// timer1.Show(); - -// MESSAGE("--------------------------- GetShapesOnPlane phase 5 takes:"); -// timer1.Reset(); -// timer1.Start(); - // Make a Python command Handle(GEOM_Object) anObj = Handle(GEOM_Object)::DownCast( aSeq->Value( 1 )); @@ -1291,7 +1389,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetShapesOnPlan GEOM::TPythonDump(aFunction) << "[" << anAsciiList.ToCString() << "] = geompy.GetShapesOnPlane(" << theShape << ", " - << theShapeType << ", " << theAx1 << ", " << theState << ")"; + << aShapeType << ", " << theAx1 << ", " << theState << ")"; SetErrorCode(OK); return aSeq; @@ -1340,7 +1438,7 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetShapesOnCyli Handle(GEOM_Function) aFunction = anObj->GetLastFunction(); GEOM::TPythonDump(aFunction) << "[" << anAsciiList.ToCString() - << "] = geompy.GetShapesOnCylinder(" << theShape << ", " << theShapeType + << "] = geompy.GetShapesOnCylinder(" << theShape << ", " << aShapeType << ", " << theAxis << ", " << theRadius << ", " << theState << ")"; SetErrorCode(OK); @@ -1393,31 +1491,13 @@ Handle(TColStd_HSequenceOfTransient) GEOMImpl_IShapesOperations::GetShapesOnSphe Handle(GEOM_Function) aFunction = anObj->GetLastFunction(); GEOM::TPythonDump(aFunction) << "[" << anAsciiList.ToCString() - << "] = geompy.GetShapesOnSphere(" << theShape << ", " << theShapeType + << "] = geompy.GetShapesOnSphere(" << theShape << ", " << aShapeType << ", " << theCenter << ", " << theRadius << ", " << theState << ")"; SetErrorCode(OK); return aSeq; } -//======================================================================= -//function : getCreatedLast - /*! - * \brief Select the object created last - * \param theObj1 - Object 1 - * \param theObj2 - Object 2 - * \retval Handle(GEOM_Object) - selected object - */ -//======================================================================= - -Handle(GEOM_Object) GEOMImpl_IShapesOperations::getCreatedLast(const Handle(GEOM_Object)& theObj1, - const Handle(GEOM_Object)& theObj2) -{ - if ( theObj1.IsNull() ) return theObj2; - if ( theObj2.IsNull() ) return theObj1; - return ( theObj1->GetEntry().Tag() > theObj2->GetEntry().Tag() ) ? theObj1 : theObj2; -} - //============================================================================= /*! * GetShapesOnPlaneIDs @@ -1452,13 +1532,12 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnPlaneI aSeq = getShapesOnSurfaceIDs( aPlane, aShape, aShapeType, theState ); // The GetShapesOnPlaneIDs() doesn't change object so no new function is required. - Handle(GEOM_Function) aFunction = getCreatedLast(theShape,theAx1)->GetLastFunction(); + Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape,theAx1)->GetLastFunction(); // Make a Python command - const bool append = true; - GEOM::TPythonDump(aFunction,append) + GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnPlane = geompy.GetShapesOnPlaneIDs" - << "(" << theShape << "," << theShapeType << "," << theAx1 << "," << theState << ")"; + << "(" << theShape << "," << aShapeType << "," << theAx1 << "," << theState << ")"; SetErrorCode(OK); return aSeq; @@ -1499,13 +1578,12 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnCylind aSeq = getShapesOnSurfaceIDs( aCylinder, aShape, aShapeType, theState ); // The GetShapesOnCylinder() doesn't change object so no new function is required. - Handle(GEOM_Function) aFunction = getCreatedLast(theShape,theAxis)->GetLastFunction(); + Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape,theAxis)->GetLastFunction(); // Make a Python command - const bool append = true; - GEOM::TPythonDump(aFunction,append) + GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnCylinder = geompy.GetShapesOnCylinderIDs" - << "(" << theShape << ", " << theShapeType << ", " << theAxis << ", " + << "(" << theShape << ", " << aShapeType << ", " << theAxis << ", " << theRadius << ", " << theState << ")"; SetErrorCode(OK); @@ -1550,13 +1628,12 @@ Handle(TColStd_HSequenceOfInteger) GEOMImpl_IShapesOperations::GetShapesOnSphere aSeq = getShapesOnSurfaceIDs( aSphere, aShape, aShapeType, theState ); // The GetShapesOnSphere() doesn't change object so no new function is required. - Handle(GEOM_Function) aFunction = getCreatedLast(theShape,theCenter)->GetLastFunction(); + Handle(GEOM_Function) aFunction = GEOM::GetCreatedLast(theShape,theCenter)->GetLastFunction(); // Make a Python command - const bool append = true; - GEOM::TPythonDump(aFunction,append) + GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnCylinder = geompy.GetShapesOnCylinderIDs" - << "(" << theShape << ", " << theShapeType << ", " << theCenter << ", " + << "(" << theShape << ", " << aShapeType << ", " << theCenter << ", " << theRadius << ", " << theState << ")"; SetErrorCode(OK); @@ -1738,7 +1815,7 @@ Handle(TColStd_HSequenceOfTransient) GEOM::TPythonDump(aFunction) << "[" << anAsciiList.ToCString() << "] = geompy.GetShapesOnQuadrangle(" << theShape << ", " - << theShapeType << ", " + << TopAbs_ShapeEnum(theShapeType) << ", " << theTopLeftPoint << ", " << theTopRigthPoint << ", " << theBottomLeftPoint << ", " @@ -1788,17 +1865,16 @@ Handle(TColStd_HSequenceOfInteger) // Make a Python command // The GetShapesOnCylinder() doesn't change object so no new function is required. - Handle(GEOM_Object) lastObj = getCreatedLast(theShape,theTopLeftPoint); - lastObj = getCreatedLast(lastObj,theTopRigthPoint); - lastObj = getCreatedLast(lastObj,theBottomRigthPoint); - lastObj = getCreatedLast(lastObj,theBottomLeftPoint); + Handle(GEOM_Object) lastObj = GEOM::GetCreatedLast(theShape,theTopLeftPoint); + lastObj = GEOM::GetCreatedLast(lastObj,theTopRigthPoint); + lastObj = GEOM::GetCreatedLast(lastObj,theBottomRigthPoint); + lastObj = GEOM::GetCreatedLast(lastObj,theBottomLeftPoint); Handle(GEOM_Function) aFunction = lastObj->GetLastFunction(); - const bool append = true; - GEOM::TPythonDump(aFunction,append) + GEOM::TPythonDump(aFunction, /*append=*/true) << "listShapesOnQuadrangle = geompy.GetShapesOnQuadrangleIDs(" << theShape << ", " - << theShapeType << ", " + << TopAbs_ShapeEnum(theShapeType) << ", " << theTopLeftPoint << ", " << theTopRigthPoint << ", " << theBottomLeftPoint << ", " @@ -2099,6 +2175,7 @@ void GEOMImpl_IShapesOperations::SortShapes(TopTools_ListOfShape& SL) MidXYZ.SetValue(Index, GPoint.X()*999 + GPoint.Y()*99 + GPoint.Z()*0.9); } + // Sorting Standard_Integer aTemp; Standard_Boolean exchange, Sort = Standard_True; @@ -2133,11 +2210,6 @@ void GEOMImpl_IShapesOperations::SortShapes(TopTools_ListOfShape& SL) //======================================================================= bool GEOMImpl_IShapesOperations::CheckTriangulation (const TopoDS_Shape& aShape) { -// MESSAGE("CheckTriangulation"); -// -// OSD_Timer timer1; -// timer1.Start(); - TopExp_Explorer exp (aShape, TopAbs_FACE); if (!exp.More()) { SetErrorCode("Shape without faces given"); @@ -2158,15 +2230,10 @@ bool GEOMImpl_IShapesOperations::CheckTriangulation (const TopoDS_Shape& aShape) Standard_Real dx = aXmax - aXmin, dy = aYmax - aYmin, dz = aZmax - aZmin; Standard_Real aDeflection = Max(Max(dx, dy), dz) * aDeviationCoefficient * 4; - -// MESSAGE("Deflection = " << aDeflection); - Standard_Real aHLRAngle = 0.349066; BRepMesh_IncrementalMesh Inc (aShape, aDeflection, Standard_False, aHLRAngle); } -// timer1.Stop(); -// timer1.Show(); return true; } diff --git a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx index 82a7d37e0..d18b35c12 100644 --- a/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_IShapesOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_IShapesOperations_HXX_ @@ -71,7 +71,15 @@ class GEOMImpl_IShapesOperations : public GEOM_IOperations { const Standard_Boolean isSorted); Standard_EXPORT Handle(GEOM_Object) GetSubShape (Handle(GEOM_Object) theMainShape, - const Standard_Integer theID); + const Standard_Integer theID); + + Standard_EXPORT Standard_Integer GetSubShapeIndex (Handle(GEOM_Object) theMainShape, + Handle(GEOM_Object) theSubShape); + + Standard_EXPORT Standard_Integer GetTopologyIndex (Handle(GEOM_Object) theMainShape, + Handle(GEOM_Object) theSubShape); + + Standard_EXPORT TCollection_AsciiString GetShapeTypeString (Handle(GEOM_Object) theShape); Standard_EXPORT Standard_Integer NumberOfFaces (Handle(GEOM_Object) theShape); Standard_EXPORT Standard_Integer NumberOfEdges (Handle(GEOM_Object) theShape); diff --git a/src/GEOMImpl/GEOMImpl_ISketcher.hxx b/src/GEOMImpl/GEOMImpl_ISketcher.hxx index e2149c82f..cf2d46f21 100644 --- a/src/GEOMImpl/GEOMImpl_ISketcher.hxx +++ b/src/GEOMImpl/GEOMImpl_ISketcher.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an interface to a function for the Sketcher creation. diff --git a/src/GEOMImpl/GEOMImpl_ISphere.hxx b/src/GEOMImpl/GEOMImpl_ISphere.hxx index ce426bfdf..23ee4c245 100644 --- a/src/GEOMImpl/GEOMImpl_ISphere.hxx +++ b/src/GEOMImpl/GEOMImpl_ISphere.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Sphere creation. diff --git a/src/GEOMImpl/GEOMImpl_ISpline.hxx b/src/GEOMImpl/GEOMImpl_ISpline.hxx index fcb9b462d..75d5ea6d0 100644 --- a/src/GEOMImpl/GEOMImpl_ISpline.hxx +++ b/src/GEOMImpl/GEOMImpl_ISpline.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Spline creation. diff --git a/src/GEOMImpl/GEOMImpl_ITorus.hxx b/src/GEOMImpl/GEOMImpl_ITorus.hxx index 39b417f7e..86909ac8c 100644 --- a/src/GEOMImpl/GEOMImpl_ITorus.hxx +++ b/src/GEOMImpl/GEOMImpl_ITorus.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Torus creation. diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx index 16885bcc3..270d78ff7 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx index 701e65690..e5ba8fddf 100644 --- a/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx +++ b/src/GEOMImpl/GEOMImpl_ITransformOperations.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOMImpl_ITransformOperations_HXX_ diff --git a/src/GEOMImpl/GEOMImpl_ITranslate.hxx b/src/GEOMImpl/GEOMImpl_ITranslate.hxx index 054b8530c..0ca4201e4 100755 --- a/src/GEOMImpl/GEOMImpl_ITranslate.hxx +++ b/src/GEOMImpl/GEOMImpl_ITranslate.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the Translate creation. diff --git a/src/GEOMImpl/GEOMImpl_IVector.hxx b/src/GEOMImpl/GEOMImpl_IVector.hxx index 2214d7dfa..63b72f370 100644 --- a/src/GEOMImpl/GEOMImpl_IVector.hxx +++ b/src/GEOMImpl/GEOMImpl_IVector.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //NOTE: This is an intreface to a function for the vector creation. @@ -29,6 +29,10 @@ #define VEC_ARG_PNT1 4 #define VEC_ARG_PNT2 5 +#define VEC_ARG_CURVE 6 +#define VEC_ARG_PARAM 7 + + class GEOMImpl_IVector { public: @@ -49,6 +53,14 @@ class GEOMImpl_IVector Handle(GEOM_Function) GetPoint1() { return _func->GetReference(VEC_ARG_PNT1); } Handle(GEOM_Function) GetPoint2() { return _func->GetReference(VEC_ARG_PNT2); } + void SetCurve(Handle(GEOM_Function) theRef) { _func->SetReference(VEC_ARG_CURVE, theRef); } + + Handle(GEOM_Function) GetCurve() { return _func->GetReference(VEC_ARG_CURVE); } + + void SetParameter(double theParam) { _func->SetReal(VEC_ARG_PARAM, theParam); } + + double GetParameter() { return _func->GetReal(VEC_ARG_PARAM); } + private: Handle(GEOM_Function) _func; diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx index e7c263c72..b20706d1e 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -50,7 +50,9 @@ #define UnLoadLib( handle ) dlclose( handle ); #endif -typedef TopoDS_Shape (*funcPoint)(const TCollection_AsciiString&, TCollection_AsciiString&); +typedef TopoDS_Shape (*funcPoint)(const TCollection_AsciiString&, + const TCollection_AsciiString&, + TCollection_AsciiString&); //======================================================================= //function : GetID @@ -84,9 +86,10 @@ Standard_Integer GEOMImpl_ImportDriver::Execute(TFunction_Logbook& log) const //Standard_Integer aType = aFunction->GetType(); // retrieve the file and plugin library names - TCollection_AsciiString aFileName = aCI.GetFileName(); - TCollection_AsciiString aLibName = aCI.GetPluginName(); - if (aFileName.IsEmpty() || aLibName.IsEmpty()) + TCollection_AsciiString aFileName = aCI.GetFileName(); + TCollection_AsciiString aFormatName = aCI.GetFormatName(); + TCollection_AsciiString aLibName = aCI.GetPluginName(); + if (aFileName.IsEmpty() || aFormatName.IsEmpty() || aLibName.IsEmpty()) return 0; // load plugin library @@ -100,7 +103,7 @@ Standard_Integer GEOMImpl_ImportDriver::Execute(TFunction_Logbook& log) const // perform the import TCollection_AsciiString anError; - TopoDS_Shape aShape = fp( aFileName, anError ); + TopoDS_Shape aShape = fp( aFileName, aFormatName, anError ); // unload plugin library UnLoadLib( anImportLib ); diff --git a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx index 0d07a34fa..318ade68e 100644 --- a/src/GEOMImpl/GEOMImpl_ImportDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ImportDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_ImportDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.cxx b/src/GEOMImpl/GEOMImpl_LineDriver.cxx index 10cfec55c..8e27bcb3c 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_LineDriver.hxx b/src/GEOMImpl/GEOMImpl_LineDriver.hxx index 58480a781..72041a016 100644 --- a/src/GEOMImpl/GEOMImpl_LineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_LineDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_LineDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx index 041510ca7..b4d605340 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx index 822c996a1..d95295692 100644 --- a/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MarkerDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_MarkerDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx index d92516814..52fdd93ce 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx index d708d1736..cceeb6df0 100644 --- a/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MeasureDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_MeasureDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx index cde05e64e..218e1fee2 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -30,12 +30,13 @@ #include #include +#include #include #include #include #include #include -#include +#include #include @@ -86,6 +87,21 @@ Standard_Integer GEOMImpl_MirrorDriver::Execute(TFunction_Logbook& log) const TopoDS_Shape anOriginal = anOriginalFunction->GetValue(); if (anOriginal.IsNull()) return 0; + // Bug 12158: Check for standalone (not included in faces) degenerated edges + TopTools_IndexedDataMapOfShapeListOfShape aEFMap; + TopExp::MapShapesAndAncestors(anOriginal, TopAbs_EDGE, TopAbs_FACE, aEFMap); + Standard_Integer i, nbE = aEFMap.Extent(); + for (i = 1; i <= nbE; i++) { + TopoDS_Shape anEdgeSh = aEFMap.FindKey(i); + if (BRep_Tool::Degenerated(TopoDS::Edge(anEdgeSh))) { + const TopTools_ListOfShape& aFaces = aEFMap.FindFromIndex(i); + if (aFaces.IsEmpty()) + Standard_ConstructionError::Raise + ("Mirror aborted : cannot process standalone degenerated edge"); + } + } + + // Perform Mirror if (aType == MIRROR_PLANE || aType == MIRROR_PLANE_COPY) { Handle(GEOM_Function) aPlane = TI.GetPlane(); if (aPlane.IsNull()) return 0; diff --git a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx index 430e6199b..f8dfd7676 100644 --- a/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_MirrorDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_MirrorDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx index d0994f5df..42d437e71 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx index 04213c437..b9ea5c641 100644 --- a/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_OffsetDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_OffsetDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx index f0ea483b2..fc91fd19c 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx index fb8236af5..095d3c1e5 100644 --- a/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PartitionDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_PartitionDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx index 7ab584415..d0875f842 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -35,10 +35,18 @@ #include #include #include +#include +#include +#include #include #include #include +#include "utilities.h" +#include +#include +#include +#include //======================================================================= //function : GetID @@ -67,51 +75,195 @@ Standard_Integer GEOMImpl_PipeDriver::Execute(TFunction_Logbook& log) const { if (Label().IsNull()) return 0; Handle(GEOM_Function) aFunction = GEOM_Function::GetFunction(Label()); - - GEOMImpl_IPipe aCI (aFunction); + GEOMImpl_IPipe* aCI= 0; Standard_Integer aType = aFunction->GetType(); + if(aType == PIPE_BASE_PATH) + aCI = new GEOMImpl_IPipe(aFunction); + else if(aType == PIPE_DIFFERENT_SECTIONS) + aCI = new GEOMImpl_IPipeDiffSect(aFunction); + else + return 0; - TopoDS_Shape aShape; + Handle(GEOM_Function) aRefPath = aCI->GetPath(); + TopoDS_Shape aShapePath = aRefPath->GetValue(); - if (aType == PIPE_BASE_PATH) { - Handle(GEOM_Function) aRefBase = aCI.GetBase(); - Handle(GEOM_Function) aRefPath = aCI.GetPath(); - TopoDS_Shape aShapeBase = aRefBase->GetValue(); - TopoDS_Shape aShapePath = aRefPath->GetValue(); - if (aShapeBase.IsNull() || aShapePath.IsNull()) { - Standard_NullObject::Raise("MakePipe aborted : null shape argument"); - } - // Get path contour - TopoDS_Wire aWire; - if (aShapePath.ShapeType() == TopAbs_WIRE) { - aWire = TopoDS::Wire(aShapePath); - } else { - if (aShapePath.ShapeType() == TopAbs_EDGE) { + if (aShapePath.IsNull()) + { + cout<<"Driver : path is null"<GetBase(); + + TopoDS_Shape aShapeBase = aRefBase->GetValue(); + + if (aShapeBase.IsNull()) { + if(aCI) delete aCI; + Standard_NullObject::Raise("MakePipe aborted : null base argument"); } // Make pipe - aShape = BRepOffsetAPI_MakePipe(aWire, aShapeBase); - } - else { + aShape = BRepOffsetAPI_MakePipe(aWirePath, aShapeBase); } + //building pipe with different sections + else if (aType == PIPE_DIFFERENT_SECTIONS) + { + GEOMImpl_IPipeDiffSect* aCIDS = (GEOMImpl_IPipeDiffSect*)aCI; + //GEOMImpl_IPipeDiffSect* aCIDS = static_cast(aCI); + BRepOffsetAPI_MakePipeShell aBuilder(aWirePath); + Handle(TColStd_HSequenceOfTransient) aBasesObjs = aCIDS->GetBases (); + Handle(TColStd_HSequenceOfTransient) aLocObjs = aCIDS->GetLocations (); + Standard_Boolean aWithContact = (aCIDS->GetWithContactMode()); + Standard_Boolean aWithCorrect = (aCIDS->GetWithCorrectionMode()); + + Standard_Integer i =1, nbBases = aBasesObjs->Length(), + nbLocs = (aLocObjs.IsNull() ? 0 :aLocObjs->Length()); + + if(nbLocs && nbLocs != nbBases) + { + if(aCI) delete aCI; + Standard_ConstructionError::Raise("Number of sections is not equal to number of locations "); + } + TopTools_SequenceOfShape aSeqBases; + TopTools_SequenceOfShape aSeqLocs; + TopTools_SequenceOfShape aSeqFaces; + for( ; i <= nbBases; i++) + { + Handle(Standard_Transient) anItem = aBasesObjs->Value(i); + if(anItem.IsNull()) + continue; + Handle(GEOM_Function) aRefBase = Handle(GEOM_Function)::DownCast(anItem); + if(aRefBase.IsNull()) + continue; + TopoDS_Shape aShapeBase = aRefBase->GetValue(); + if(aShapeBase.IsNull()) + continue; + TopAbs_ShapeEnum aTypeBase = aShapeBase.ShapeType(); + + //if for section was specified face with a few wires then a few + // pipes were build and make solid + if(aTypeBase == TopAbs_FACE) + { + //for case one path should be used other type function + aSeqFaces.Append(aShapeBase); + TopExp_Explorer aExpW(aShapeBase,TopAbs_WIRE); + for( ; aExpW.More(); aExpW.Next()) + { + TopoDS_Shape aWireProf = aExpW.Current(); + aSeqBases.Append(aWireProf); + } + } + else if(aTypeBase == TopAbs_WIRE || aTypeBase == TopAbs_VERTEX) + aSeqBases.Append(aShapeBase); + else if(aTypeBase == TopAbs_EDGE) + { + TopoDS_Edge anEdge = TopoDS::Edge(aShapeBase); + TopoDS_Shape aWireProf = BRepBuilderAPI_MakeWire(anEdge); + aSeqBases.Append(aWireProf); + } + if(nbLocs) + { + Handle(Standard_Transient) anItemLoc = aLocObjs->Value(i); + if(anItemLoc.IsNull()) + continue; + Handle(GEOM_Function) aRefLoc = Handle(GEOM_Function)::DownCast(anItemLoc); + TopoDS_Shape aShapeLoc = aRefLoc->GetValue(); + if(aShapeLoc.IsNull() || aShapeLoc.ShapeType() != TopAbs_VERTEX) + continue; + aSeqLocs.Append(aShapeLoc); + } + } + + nbLocs = aSeqLocs.Length(); + Standard_Integer nbShapes = aSeqBases.Length(); + Standard_Integer step = nbShapes/nbBases; + + if(nbShapes < nbBases || fmod((double)nbShapes, (double)nbBases)) + { + if(aCI) delete aCI; + Standard_ConstructionError::Raise("Invalid sections were specified for building pipe"); + } + + Standard_Integer ind =0; + for( i=1; i <= nbShapes && ind < nbShapes; i++) //i+nbBases <= nbShapes + { + TopTools_SequenceOfShape usedBases; + Standard_Integer j = 1; + for( ; j <= nbBases ; j++) + { + ind = i + (j-1)*step; + + TopoDS_Shape aWireProf = aSeqBases.Value(ind); + usedBases.Append(aWireProf); + if(nbLocs) + { + TopoDS_Shape aShapeLoc = aSeqLocs.Value(j); + TopoDS_Vertex aVert = TopoDS::Vertex(aShapeLoc); + aBuilder.Add(aWireProf,aVert,aWithContact,aWithCorrect); + } + else + aBuilder.Add(aWireProf,aWithContact,aWithCorrect); + } + if(!aBuilder.IsReady()) + { + if(aCI) delete aCI; + Standard_ConstructionError::Raise("Invalid input data for building PIPE: bases are invalid"); + } + aBuilder.Build(); + aShape = aBuilder.Shape(); + aSeqFaces.Append(aShape); + for( j = 1; j <=usedBases.Length(); j++) + aBuilder.Delete(usedBases.Value(j)); + } + + //for case if section is face + if(aSeqFaces.Length() >1) + { + BRep_Builder aB; + TopoDS_Compound aComp; + aB.MakeCompound(aComp); + for( i = 1; i <= aSeqFaces.Length(); i++) + aB.Add(aComp,aSeqFaces.Value(i)); + aShape = aComp; + } + } if (aShape.IsNull()) return 0; BRepCheck_Analyzer ana (aShape, Standard_False); if (!ana.IsValid()) { + if(aCI) delete aCI; Standard_ConstructionError::Raise("Algorithm have produced an invalid shape result"); } aFunction->SetValue(aShape); log.SetTouched(Label()); - + if(aCI) delete aCI; return 1; } diff --git a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx index 5c9897ac4..888b2cd5d 100644 --- a/src/GEOMImpl/GEOMImpl_PipeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PipeDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_PipeDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx index 8941ba280..bd5ccdee1 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -27,6 +27,8 @@ #include #include +#include +#include #include #include @@ -42,6 +44,8 @@ #include #include #include +#include +#include #include #include @@ -126,7 +130,45 @@ Standard_Integer GEOMImpl_PlaneDriver::Execute(TFunction_Logbook& log) const Standard_TypeMismatch::Raise("Plane creation aborted: non-planar face given as argument"); } aShape = BRepBuilderAPI_MakeFace(aGS, -aSize, +aSize, -aSize, +aSize).Shape(); - } else { + } + else if (aType == PLANE_TANGENT_FACE) + { + Handle(GEOM_Function) aRefFace = aPI.GetFace(); + TopoDS_Shape aShape1 = aRefFace->GetValue(); + if(aShape1.IsNull()) + Standard_TypeMismatch::Raise("Plane was not created.Basis face was not specified"); + TopoDS_Face aFace = TopoDS::Face(aShape1); + + Standard_Real aKoefU = aPI.GetParameterU(); + Standard_Real aKoefV = aPI.GetParameterV(); + Standard_Real aUmin,aUmax,aVmin,aVmax; + ShapeAnalysis::GetFaceUVBounds(aFace,aUmin,aUmax,aVmin,aVmax); + Standard_Real aDeltaU = aUmax - aUmin; + Standard_Real aDeltaV = aVmax - aVmin; + Standard_Real aParamU = aUmin + aDeltaU*aKoefU; + Standard_Real aParamV = aVmin + aDeltaV*aKoefV; + Handle(Geom_Surface) aSurf = BRep_Tool::Surface(aFace); + if(aSurf.IsNull()) + Standard_TypeMismatch::Raise("Plane was not created.Base surface is absent"); + gp_Vec aVecU,aVecV; + gp_Pnt aPLoc; + aSurf->D1(aParamU,aParamV,aPLoc,aVecU,aVecV); + BRepTopAdaptor_FClass2d clas(aFace,Precision::PConfusion()); + + TopAbs_State stOut= clas.PerformInfinitePoint(); + gp_Pnt2d aP2d(aParamU,aParamV); + TopAbs_State st= clas.Perform(aP2d); + if(st == stOut) + Standard_TypeMismatch::Raise("Plane was not created.Point lies outside the face"); + gp_Vec aNorm = aVecU^aVecV; + gp_Ax3 anAxis(aPLoc,gp_Dir(aNorm),gp_Dir(aVecU)); + gp_Pln aPlane(anAxis); + BRepBuilderAPI_MakeFace aTool(aPlane, -aSize, +aSize, -aSize, +aSize); + if(aTool.IsDone()) + aShape = aTool.Shape(); + } + + else { } if (aShape.IsNull()) return 0; diff --git a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx index c772fe1b2..926d1e905 100644 --- a/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PlaneDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_PlaneDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.cxx b/src/GEOMImpl/GEOMImpl_PointDriver.cxx index 99bf329be..3b8f5270d 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_PointDriver.hxx b/src/GEOMImpl/GEOMImpl_PointDriver.hxx index 3a0ae554f..50f098be7 100644 --- a/src/GEOMImpl/GEOMImpl_PointDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PointDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_PointDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx index 3399b5715..a079f608c 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx index fa3de0a28..0f9b7a6a8 100644 --- a/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PolylineDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_PolylineDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx index deb251d0a..8e0fb508f 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx index a7b833e6c..64d2a19d1 100644 --- a/src/GEOMImpl/GEOMImpl_PositionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PositionDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_PositionDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx index 6be39bc15..87157a5fc 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx index 5129bcbc7..27ce618c9 100644 --- a/src/GEOMImpl/GEOMImpl_PrismDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_PrismDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_PrismDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx index 9208b717b..beec64f3c 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx index c063c435e..1290b8339 100644 --- a/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RevolutionDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_RevolutionDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx index 8c76d1862..f252716aa 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx index c9800cfb0..e88b65697 100644 --- a/src/GEOMImpl/GEOMImpl_RotateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_RotateDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_RotateDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx index 21824877f..88342f057 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -27,11 +27,13 @@ #include #include +#include +#include +#include #include #include #include -#include -#include +#include #include #include @@ -77,6 +79,21 @@ Standard_Integer GEOMImpl_ScaleDriver::Execute(TFunction_Logbook& log) const if (aShapeBase.IsNull() || aShapePnt.IsNull()) return 0; if (aShapePnt.ShapeType() != TopAbs_VERTEX) return 0; + // Bug 6839: Check for standalone (not included in faces) degenerated edges + TopTools_IndexedDataMapOfShapeListOfShape aEFMap; + TopExp::MapShapesAndAncestors(aShapeBase, TopAbs_EDGE, TopAbs_FACE, aEFMap); + Standard_Integer i, nbE = aEFMap.Extent(); + for (i = 1; i <= nbE; i++) { + TopoDS_Shape anEdgeSh = aEFMap.FindKey(i); + if (BRep_Tool::Degenerated(TopoDS::Edge(anEdgeSh))) { + const TopTools_ListOfShape& aFaces = aEFMap.FindFromIndex(i); + if (aFaces.IsEmpty()) + Standard_ConstructionError::Raise + ("Scaling aborted : cannot scale standalone degenerated edge"); + } + } + + // Perform Scaling gp_Pnt aP = BRep_Tool::Pnt(TopoDS::Vertex(aShapePnt)); gp_Trsf aTrsf; aTrsf.SetScale(aP, aCI.GetFactor()); @@ -87,6 +104,9 @@ Standard_Integer GEOMImpl_ScaleDriver::Execute(TFunction_Logbook& log) const if (aShape.IsNull()) return 0; + if (!BRepAlgo::IsValid(aShape)) + Standard_ConstructionError::Raise("Scaling aborted : non valid shape result"); + aFunction->SetValue(aShape); log.SetTouched(Label()); diff --git a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx index 3f80b8311..bbc2f7c9c 100644 --- a/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ScaleDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_ScaleDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx index 50ba2a682..5177a5081 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx index 32dab4150..fa0a0023d 100644 --- a/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_ShapeDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_ShapeDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx index b6075c0b4..b62081d4c 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx index 04886ea7f..6d84a4d06 100644 --- a/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SketcherDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_SketcherDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx index 1cd98297e..c8d175adc 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx index d770e7213..065fcb22c 100644 --- a/src/GEOMImpl/GEOMImpl_SphereDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SphereDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_SphereDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx index 0e1bae59a..4f5832006 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx index 3e809de8a..e09a0446a 100644 --- a/src/GEOMImpl/GEOMImpl_SplineDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_SplineDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_SplineDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_Template.cxx b/src/GEOMImpl/GEOMImpl_Template.cxx index 992faed5c..ccfb70528 100644 --- a/src/GEOMImpl/GEOMImpl_Template.cxx +++ b/src/GEOMImpl/GEOMImpl_Template.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_Template.hxx b/src/GEOMImpl/GEOMImpl_Template.hxx index 916cf6ab9..866b7fefe 100644 --- a/src/GEOMImpl/GEOMImpl_Template.hxx +++ b/src/GEOMImpl/GEOMImpl_Template.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_Template.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx index 023355213..810757b74 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx index cca5123ca..f27520ed1 100644 --- a/src/GEOMImpl/GEOMImpl_TorusDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TorusDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_TorusDriver.ixx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx index 33a6590df..8bc498a2a 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx index 48c05cff5..d8294a2d3 100644 --- a/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_TranslateDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_TranslateDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GEOMImpl_Types.hxx b/src/GEOMImpl/GEOMImpl_Types.hxx index 392163c0d..4f679dd16 100755 --- a/src/GEOMImpl/GEOMImpl_Types.hxx +++ b/src/GEOMImpl/GEOMImpl_Types.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //GEOM_Object types @@ -79,6 +79,8 @@ #define GEOM_MARKER 39 +#define GEOM_THRUSECTIONS 40 + //GEOM_Function types #define COPY_WITH_REF 1 @@ -90,13 +92,16 @@ #define POINT_XYZ 1 #define POINT_XYZ_REF 2 #define POINT_CURVE_PAR 3 +//#define POINT_FACE_PAR 4 #define VECTOR_TWO_PNT 1 #define VECTOR_DX_DY_DZ 2 +#define VECTOR_TANGENT_CURVE_PAR 3 #define PLANE_PNT_VEC 1 #define PLANE_FACE 2 #define PLANE_THREE_PNT 3 +#define PLANE_TANGENT_FACE 4 #define LINE_TWO_PNT 1 #define LINE_PNT_DIR 2 @@ -152,6 +157,10 @@ #define REVOLUTION_BASE_AXIS_ANGLE 1 #define PIPE_BASE_PATH 1 +#define PIPE_DIFFERENT_SECTIONS 2 + +#define THRUSECTIONS_RULED 1 +#define THRUSECTIONS_SMOOTHED 2 #define BOOLEAN_COMMON 1 #define BOOLEAN_CUT 2 diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx index 531077599..0be034733 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.cxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -34,6 +34,8 @@ #include #include +#include +#include #include #include @@ -67,7 +69,7 @@ Standard_Integer GEOMImpl_VectorDriver::Execute(TFunction_Logbook& log) const GEOMImpl_IVector aPI (aFunction); Standard_Integer aType = aFunction->GetType(); - if (aType != VECTOR_DX_DY_DZ && aType != VECTOR_TWO_PNT) return 0; + if (aType != VECTOR_DX_DY_DZ && aType != VECTOR_TWO_PNT && aType != VECTOR_TANGENT_CURVE_PAR) return 0; TopoDS_Shape aShape; @@ -98,7 +100,32 @@ Standard_Integer GEOMImpl_VectorDriver::Execute(TFunction_Logbook& log) const Standard_ConstructionError::Raise("The end points are too close"); } aShape = BRepBuilderAPI_MakeEdge(V1, V2).Shape(); - } else { + } + else if(aType == VECTOR_TANGENT_CURVE_PAR) { + Handle(GEOM_Function) aRefCurve = aPI.GetCurve(); + TopoDS_Shape aRefShape = aRefCurve->GetValue(); + if (aRefShape.ShapeType() != TopAbs_EDGE) { + Standard_TypeMismatch::Raise + ("Tangent On Curve creation aborted : curve shape is not an edge"); + } + Standard_Real aFParam =0., aLParam =0., aParam =0.; + Handle(Geom_Curve) aCurve = BRep_Tool::Curve(TopoDS::Edge(aRefShape), aFParam, aLParam); + if(aCurve.IsNull()) { + Standard_TypeMismatch::Raise + ("Tangent On Curve creation aborted : curve is null"); + } + + aParam = aFParam + (aLParam - aFParam) * aPI.GetParameter(); + gp_Pnt aPoint1,aPoint2; + gp_Vec aVec; + aCurve->D1(aParam,aPoint1,aVec); + if(aVec.Magnitude() < gp::Resolution()) + Standard_TypeMismatch::Raise + ("Tangent On Curve creation aborted : invalid value of tangent"); + aPoint2.SetXYZ(aPoint1.XYZ() + aVec.XYZ()); + BRepBuilderAPI_MakeEdge aBuilder(aPoint1,aPoint2); + if(aBuilder.IsDone()) + aShape = aBuilder.Shape(); } if (aShape.IsNull()) return 0; diff --git a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx index ed31f6dc9..38c92fd52 100644 --- a/src/GEOMImpl/GEOMImpl_VectorDriver.hxx +++ b/src/GEOMImpl/GEOMImpl_VectorDriver.hxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : GEOMImpl_VectorDriver.hxx // Module : GEOMImpl diff --git a/src/GEOMImpl/GUID.txt b/src/GEOMImpl/GUID.txt index 285d047d6..0c03153c7 100755 --- a/src/GEOMImpl/GUID.txt +++ b/src/GEOMImpl/GUID.txt @@ -18,6 +18,7 @@ FF1BBB16-5D14-4df2-980B-3A668264EA16 // Sphere FF1BBB17-5D14-4df2-980B-3A668264EA16 // Prism (Extrusion) FF1BBB18-5D14-4df2-980B-3A668264EA16 // Revolution FF1BBB19-5D14-4df2-980B-3A668264EA16 // Pipe +FF1BB971-E99C-4f89-B989-5B48E061049B //ThruSections FF1BBB21-5D14-4df2-980B-3A668264EA16 // Boolean FF1BBB22-5D14-4df2-980B-3A668264EA16 // Partition diff --git a/src/GEOMImpl/Makefile.in b/src/GEOMImpl/Makefile.in index d715111aa..73061a42c 100644 --- a/src/GEOMImpl/Makefile.in +++ b/src/GEOMImpl/Makefile.in @@ -1,3 +1,23 @@ +# GEOM GEOM : implementaion of GEOM_Gen.idl +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com top_srcdir=@top_srcdir@ top_builddir=../.. @@ -40,6 +60,7 @@ LIB_SRC = GEOMImpl_IBasicOperations.cxx \ GEOMImpl_TorusDriver.cxx \ GEOMImpl_PrismDriver.cxx \ GEOMImpl_PipeDriver.cxx \ + GEOMImpl_ThruSectionsDriver.cxx \ GEOMImpl_RevolutionDriver.cxx \ GEOMImpl_ShapeDriver.cxx \ GEOMImpl_BlockDriver.cxx \ @@ -91,9 +112,9 @@ EXPORT_HEADERS= GEOMImpl_Gen.hxx \ GEOMImpl_Types.hxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -L${KERNEL_ROOT_DIR}/lib/salome $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lCASCatch -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(KERNEL_LDFLAGS) $(CAS_LDPATH) -lTKCAF -lTKFillet -lTKOffset -lGEOMbasic -lNMTAlgo -lGEOMAlgo -lShHealOper # additional file to be cleaned diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index 6fbf935f8..d79cbceb4 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.h b/src/GEOMToolsGUI/GEOMToolsGUI.h index 53a8b5f1e..6cdd066f9 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx index 1d1c12a38..55de2df9d 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_1.cxx @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -33,7 +33,6 @@ #include "GeometryGUI.h" #include "GEOMToolsGUI_TransparencyDlg.h" #include "GEOMToolsGUI_NbIsosDlg.h" // Method ISOS adjustement -#include "GEOMToolsGUI_NameDlg.h" #include "GEOM_Actor.h" #include "GEOMBase.h" @@ -57,10 +56,12 @@ #include #include -#include #include #include +#include +#include + #include "SALOMEDSClient.hxx" #include "utilities.h" @@ -195,7 +196,7 @@ void GEOMToolsGUI::OnRename() if( obj->FindAttribute(anAttr, "AttributeName") ) { _PTR(AttributeName) aName (anAttr); - QString newName = GEOMToolsGUI_NameDlg::getName( app->desktop(), aName->Value().c_str() ); + QString newName = LightApp_NameDlg::getName( app->desktop(), aName->Value().c_str() ); if ( !newName.isEmpty() ) { aName->SetValue( newName.latin1() ); // rename the SObject IObject->setName( newName.latin1() );// rename the InteractiveObject diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx deleted file mode 100644 index b4876de4c..000000000 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NameDlg.cxx +++ /dev/null @@ -1,135 +0,0 @@ -// SALOME GEOMToolsGUI : implementation of desktop and GUI kernel -// -// Copyright (C) 2003 CEA/DEN, EDF R&D -// -// -// -// File : GEOMToolsGUI_NameDlg.cxx -// Author : Vadim SANDLER -// Module : SALOME -// $Header$ - - -#include "GEOMToolsGUI_NameDlg.h" -#include -#include -#include -#include - -#include -#include -#include -#include -#include - -//using namespace std; -/*! - Constructor -*/ -GEOMToolsGUI_NameDlg::GEOMToolsGUI_NameDlg( QWidget* parent ) - : QDialog( parent ? parent : SUIT_Session::session()->activeApplication()->desktop(), - "GEOMToolsGUI_NameDlg", - true, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu ) -{ - setCaption( tr("TLT_RENAME") ); - setSizeGripEnabled( TRUE ); - - QVBoxLayout* topLayout = new QVBoxLayout( this ); - topLayout->setMargin( 11 ); topLayout->setSpacing( 6 ); - - /***************************************************************/ - QGroupBox* GroupC1 = new QGroupBox( this, "GroupC1" ); - GroupC1->setColumnLayout(0, Qt::Vertical ); - GroupC1->layout()->setMargin( 0 ); GroupC1->layout()->setSpacing( 0 ); - QHBoxLayout* GroupC1Layout = new QHBoxLayout( GroupC1->layout() ); - GroupC1Layout->setAlignment( Qt::AlignTop ); - GroupC1Layout->setMargin( 11 ); GroupC1Layout->setSpacing( 6 ); - - QLabel* TextLabel = new QLabel( GroupC1, "TextLabel1" ); - TextLabel->setText( tr( "NAME_LBL" ) ); - GroupC1Layout->addWidget( TextLabel ); - - myLineEdit = new QLineEdit( GroupC1, "LineEdit1" ); - myLineEdit->setMinimumSize( 250, 0 ); - GroupC1Layout->addWidget( myLineEdit ); - - /***************************************************************/ - QGroupBox* GroupButtons = new QGroupBox( this, "GroupButtons" ); - GroupButtons->setColumnLayout(0, Qt::Vertical ); - GroupButtons->layout()->setMargin( 0 ); GroupButtons->layout()->setSpacing( 0 ); - QHBoxLayout* GroupButtonsLayout = new QHBoxLayout( GroupButtons->layout() ); - GroupButtonsLayout->setAlignment( Qt::AlignTop ); - GroupButtonsLayout->setMargin( 11 ); GroupButtonsLayout->setSpacing( 6 ); - - myButtonOk = new QPushButton( GroupButtons, "buttonOk" ); - myButtonOk->setText( tr( "GEOM_BUT_OK" ) ); - myButtonOk->setAutoDefault( TRUE ); - myButtonOk->setDefault( TRUE ); - GroupButtonsLayout->addWidget( myButtonOk ); - - GroupButtonsLayout->addStretch(); - - myButtonCancel = new QPushButton( GroupButtons, "buttonCancel" ); - myButtonCancel->setText( tr( "GEOM_BUT_CANCEL" ) ); - myButtonCancel->setAutoDefault( TRUE ); - GroupButtonsLayout->addWidget( myButtonCancel ); - /***************************************************************/ - - topLayout->addWidget( GroupC1 ); - topLayout->addWidget( GroupButtons ); - - // signals and slots connections - connect( myButtonOk, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( myButtonCancel, SIGNAL( clicked() ), this, SLOT( reject() ) ); - - /* Move widget on the botton right corner of main widget */ - SUIT_Tools::centerWidget( this, parent ); -} - -/*! - Destructor -*/ -GEOMToolsGUI_NameDlg::~GEOMToolsGUI_NameDlg() -{ -} - -/*! - Sets name -*/ -void GEOMToolsGUI_NameDlg::setName( const QString& name ) -{ - myLineEdit->setText( name ); - myLineEdit->end(false); - myLineEdit->home(true); -} - -/*! - Returns name entered by user -*/ -QString GEOMToolsGUI_NameDlg::name() -{ - return myLineEdit->text(); -} - -void GEOMToolsGUI_NameDlg::accept() -{ - if ( name().stripWhiteSpace().isEmpty() ) - return; - QDialog::accept(); -} - -/*! - Creates modal dialog and returns name entered [ static ] -*/ -QString GEOMToolsGUI_NameDlg::getName( QWidget* parent, const QString& oldName ) -{ - QString n; - GEOMToolsGUI_NameDlg* dlg = new GEOMToolsGUI_NameDlg( parent ); - if ( !oldName.isNull() ) - dlg->setName( oldName ); - if ( dlg->exec() == QDialog::Accepted ) - n = dlg->name(); - delete dlg; - return n; -} diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx index 0a6614894..edc2bd62a 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -28,6 +28,10 @@ #include "GEOMToolsGUI_NbIsosDlg.h" +#include "GeometryGUI.h" +#include +#include +#include #include #include @@ -104,22 +108,28 @@ GEOMToolsGUI_NbIsosDlg::GEOMToolsGUI_NbIsosDlg(QWidget* parent ) QPushButton* buttonCancel = new QPushButton( GroupButtons, "buttonCancel" ); buttonCancel->setText( tr( "GEOM_BUT_CANCEL" ) ) ; buttonCancel->setAutoDefault( TRUE ); - GroupButtonsLayout->addWidget( buttonCancel, 0, 2 ); + GroupButtonsLayout->addWidget( buttonCancel, 0, 1 ); + + QPushButton* buttonHelp = new QPushButton( GroupButtons, "buttonHelp" ); + buttonHelp->setText( tr( "GEOM_BUT_HELP" ) ) ; + buttonHelp->setAutoDefault( TRUE ); + GroupButtonsLayout->addWidget( buttonHelp, 0, 2 ); /***************************************************************/ MyDialogLayout->addWidget(GroupC1, 0, 0); MyDialogLayout->addWidget(GroupButtons, 1, 0); - + + myHelpFileName = "isos.htm"; // signals and slots connections connect(buttonOk, SIGNAL(clicked()), this, SLOT(accept())); connect(buttonCancel, SIGNAL(clicked()), this, SLOT(reject())); + connect(buttonHelp, SIGNAL(clicked()), this, SLOT(ClickOnHelp())); /* Move widget on the botton right corner of main widget */ SUIT_Tools::centerWidget(this, parent); } - //================================================================================= // function : ~GEOMToolsGUI_NbIsosDlg() // purpose : Destroys the object and frees any allocated resources @@ -149,3 +159,21 @@ void GEOMToolsGUI_NbIsosDlg::setV( const int v ) SpinBoxV->setValue( v ); } +//================================================================================= +// function : ClickOnHelp() +// purpose : +//================================================================================= +void GEOMToolsGUI_NbIsosDlg::ClickOnHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) { + GeometryGUI* aGeomGUI = dynamic_cast( app->module( "Geometry" ) ); + app->onHelpContextModule(aGeomGUI ? app->moduleName(aGeomGUI->moduleName()) : QString(""), myHelpFileName); + } + else { + SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(myHelpFileName), + QObject::tr("BUT_OK")); + } +} diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h index a558708e8..632e86473 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_NbIsosDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -53,9 +53,13 @@ public: void setU( const int ); void setV( const int ); +private slots: + void ClickOnHelp(); + private: QSpinBox* SpinBoxU; QSpinBox* SpinBoxV; + QString myHelpFileName; }; diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx index 0984dd88c..d739bcbc4 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -29,6 +29,7 @@ #include "GEOMToolsGUI_TransparencyDlg.h" #include "GEOMBase.h" #include "GEOM_AISShape.hxx" +#include "GeometryGUI.h" #include "SALOME_ListIO.hxx" #include "SALOME_ListIteratorOfListIO.hxx" @@ -43,11 +44,13 @@ #include #include #include +#include #include #include #include #include +#include #include #include @@ -96,9 +99,15 @@ GEOMToolsGUI_TransparencyDlg::GEOMToolsGUI_TransparencyDlg( QWidget* parent ) buttonOk->setText( tr( "GEOM_BUT_OK" ) ); buttonOk->setAutoDefault( TRUE ); buttonOk->setDefault( TRUE ); - GroupButtonsLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 0 ); - GroupButtonsLayout->addWidget( buttonOk, 0, 1 ); - GroupButtonsLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 2 ); + + QPushButton* buttonHelp = new QPushButton( GroupButtons, "buttonHelp" ); + buttonHelp->setText( tr( "GEOM_BUT_HELP" ) ); + buttonHelp->setAutoDefault( TRUE ); + buttonHelp->setDefault( TRUE ); + + GroupButtonsLayout->addWidget( buttonOk, 0, 0 ); + GroupButtonsLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum), 0, 1 ); + GroupButtonsLayout->addWidget( buttonHelp, 0, 2 ); /*************************************************************************/ QGroupBox* GroupC1 = new QGroupBox( this, "GroupC1" ); @@ -137,8 +146,11 @@ GEOMToolsGUI_TransparencyDlg::GEOMToolsGUI_TransparencyDlg( QWidget* parent ) // mySlider->setValue( 5 ) ; ValueHasChanged(mySlider->value()); + myHelpFileName = "transparency.htm"; + // signals and slots connections : after ValueHasChanged() connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); + connect(buttonHelp, SIGNAL(clicked()), this, SLOT(ClickOnHelp())); connect(mySlider, SIGNAL(valueChanged(int)), this, SLOT(ValueHasChanged(int))); } @@ -174,6 +186,24 @@ void GEOMToolsGUI_TransparencyDlg::ClickOnClose() return; } +//================================================================================= +// function : ClickOnHelp() +// purpose : +//================================================================================= +void GEOMToolsGUI_TransparencyDlg::ClickOnHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) { + GeometryGUI* aGeomGUI = dynamic_cast( app->module( "Geometry" ) ); + app->onHelpContextModule(aGeomGUI ? app->moduleName(aGeomGUI->moduleName()) : QString(""), myHelpFileName); + } + else { + SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(myHelpFileName), + QObject::tr("BUT_OK")); + } +} //================================================================================= // function : ValueHasChanged() diff --git a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h index 482df760e..5153cfb4f 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h +++ b/src/GEOMToolsGUI/GEOMToolsGUI_TransparencyDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -51,10 +51,12 @@ public: private : bool myFirstInit ; /* Inform for the first init */ QSlider* mySlider; + QString myHelpFileName; private slots: void ClickOnOk(); void ClickOnClose(); + void ClickOnHelp(); void ValueHasChanged( int ) ; }; diff --git a/src/GEOMToolsGUI/Makefile.in b/src/GEOMToolsGUI/Makefile.in index 1dac4b1ab..f5fcab3e9 100644 --- a/src/GEOMToolsGUI/Makefile.in +++ b/src/GEOMToolsGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -38,17 +38,15 @@ VPATH=.:@srcdir@:@top_srcdir@/idl LIB = libGEOMToolsGUI.la # header files -EXPORT_HEADERS= +EXPORT_HEADERS = LIB_SRC = GEOMToolsGUI.cxx \ GEOMToolsGUI_1.cxx \ GEOMToolsGUI_TransparencyDlg.cxx \ - GEOMToolsGUI_NbIsosDlg.cxx \ - GEOMToolsGUI_NameDlg.cxx + GEOMToolsGUI_NbIsosDlg.cxx LIB_MOC = GEOMToolsGUI_TransparencyDlg.h \ - GEOMToolsGUI_NbIsosDlg.h \ - GEOMToolsGUI_NameDlg.h + GEOMToolsGUI_NbIsosDlg.h LIB_CLIENT_IDL = SALOMEDS_Attributes.idl \ SALOME_GenericObj.idl \ @@ -59,9 +57,9 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome -CXXFLAGS += $(BOOST_CPPFLAGS) -I$(KERNEL_ROOT_DIR)/include/salome -I$(GUI_ROOT_DIR)/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) -LDFLAGS += -L$(KERNEL_ROOT_DIR)/lib/salome -L$(GUI_ROOT_DIR)/lib/salome -lGEOMBase -lVTKViewer -lOCCViewer -lsuit -lSalomeApp +LDFLAGS += $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) -lGEOMBase -lVTKViewer -lOCCViewer -lsuit -lSalomeApp @CONCLUDE@ diff --git a/src/GEOM_I/GEOM_DumpPython.cc b/src/GEOM_I/GEOM_DumpPython.cc index 19e6ed621..3fb087871 100644 --- a/src/GEOM_I/GEOM_DumpPython.cc +++ b/src/GEOM_I/GEOM_DumpPython.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WNT #pragma warning( disable:4786 ) @@ -64,7 +64,7 @@ Engines::TMPFile* GEOM_Gen_i::DumpPython(CORBA::Object_ptr theStudy, } TCollection_AsciiString aScript = - "### This file is generated by SALOME automatically by dump python funcitonality\n" + "### This file is generated by SALOME automatically by dump python functionality\n" "### of GEOM component\n\n"; aScript += _impl->DumpPython(aStudy->StudyId(), aMap, isPublished, isValidScript); diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc index 27982a0cd..9c47655e7 100644 --- a/src/GEOM_I/GEOM_Gen_i.cc +++ b/src/GEOM_I/GEOM_Gen_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WNT #pragma warning( disable:4786 ) @@ -47,6 +47,7 @@ #include #include #include +#include #include "SALOMEDS_Tool.hxx" @@ -67,6 +68,7 @@ GEOM_Gen_i::GEOM_Gen_i(CORBA::ORB_ptr orb, _impl = new ::GEOMImpl_Gen; + OSD::SetSignal( true ); } diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh index 8c65d835e..30188801f 100644 --- a/src/GEOM_I/GEOM_Gen_i.hh +++ b/src/GEOM_I/GEOM_Gen_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef __GEOM_GEN_I_H__ #define __GEOM_GEN_I_H__ diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc index ac8d8fb6b..561d24512 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.cc +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -484,3 +484,101 @@ GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeFilling(GEOM::GEOM_Object_pt return GetObject(anObject); } + +//============================================================================= +/*! + * MakeThruSections + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakeThruSections(const GEOM::ListOfGO& theSeqSections, + CORBA::Boolean theModeSolid, + CORBA::Double thePreci, + CORBA::Boolean theRuled) +{ + GEOM::GEOM_Object_var aGEOMObject; + + //Set a not done flag + GetOperations()->SetNotDone(); + Handle(TColStd_HSequenceOfTransient) aSeqSections = new TColStd_HSequenceOfTransient; + int ind, aLen; + + //Get the shapes + aLen = theSeqSections.length(); + for (ind = 0; ind < aLen; ind++) { + if (theSeqSections[ind] == NULL) continue; + Handle(GEOM_Object) aSh = GetOperations()->GetEngine()->GetObject + (theSeqSections[ind]->GetStudyID(), theSeqSections[ind]->GetEntry()); + if (!aSh.IsNull()) + aSeqSections->Append(aSh); + } + if(!aSeqSections->Length()) + return aGEOMObject._retn(); + + // Make shell or solid + Handle(GEOM_Object) anObject = + GetOperations()->MakeThruSections(aSeqSections,theModeSolid,thePreci,theRuled); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} + +//============================================================================= +/*! + * MakePipeWithDifferentSections + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_I3DPrimOperations_i::MakePipeWithDifferentSections(const GEOM::ListOfGO& theBases, + const GEOM::ListOfGO& theLocations, + GEOM::GEOM_Object_ptr thePath, + CORBA::Boolean theWithContact, + CORBA::Boolean theWithCorrections) +{ + GEOM::GEOM_Object_var aGEOMObject; + + //Set a not done flag + GetOperations()->SetNotDone(); + Handle(TColStd_HSequenceOfTransient) aSeqBases = new TColStd_HSequenceOfTransient; + Handle(TColStd_HSequenceOfTransient) aSeqLocations = new TColStd_HSequenceOfTransient; + int ind=0, aNbBases =0,aNbLocs=0; + + //Get the shapes + aNbBases = theBases.length(); + aNbLocs = theLocations.length(); + + if( aNbLocs && aNbBases != aNbLocs) + return aGEOMObject._retn(); + + Handle(GEOM_Object) aPath = GetOperations()->GetEngine()->GetObject + (thePath->GetStudyID(), thePath->GetEntry()); + if(aPath.IsNull()) + return aGEOMObject._retn(); + + for (ind = 0; ind < aNbBases; ind++) { + if (theBases[ind] == NULL) continue; + Handle(GEOM_Object) aBase = GetOperations()->GetEngine()->GetObject(theBases[ind]->GetStudyID(), + theBases[ind]->GetEntry()); + if(aBase.IsNull()) + continue; + if(aNbLocs) + { + Handle(GEOM_Object) aLoc = GetOperations()->GetEngine()->GetObject + (theLocations[ind]->GetStudyID(), theLocations[ind]->GetEntry()); + if(aLoc.IsNull()) + continue; + aSeqLocations->Append(aLoc); + } + aSeqBases->Append(aBase); + } + if(!aSeqBases->Length()) + return aGEOMObject._retn(); + + // Make pipe + Handle(GEOM_Object) anObject = + GetOperations()->MakePipeWithDifferentSections(aSeqBases,aSeqLocations ,aPath, + theWithContact,theWithCorrections); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} diff --git a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh index b4cdebc5d..8ce0c55a4 100644 --- a/src/GEOM_I/GEOM_I3DPrimOperations_i.hh +++ b/src/GEOM_I/GEOM_I3DPrimOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_I3DPrimOperations_i_HeaderFile @@ -95,6 +95,17 @@ class GEOM_I_EXPORT GEOM_I3DPrimOperations_i : GEOM::GEOM_Object_ptr MakeFilling(GEOM::GEOM_Object_ptr theShape, CORBA::Long theMinDeg, CORBA::Long theMaxDeg, CORBA::Double theTol2D, CORBA::Double theTol3D, CORBA::Long theNbIter); + GEOM::GEOM_Object_ptr MakeThruSections(const GEOM::ListOfGO& theSeqSections, + CORBA::Boolean theModeSolid, + CORBA::Double thePreci, + CORBA::Boolean theRuled); + + GEOM::GEOM_Object_ptr MakePipeWithDifferentSections(const GEOM::ListOfGO& theBases, + const GEOM::ListOfGO& theLocations, + GEOM::GEOM_Object_ptr thePath, + CORBA::Boolean theWithContact, + CORBA::Boolean theWithCorrections); + ::GEOMImpl_I3DPrimOperations* GetOperations() { return (::GEOMImpl_I3DPrimOperations*)GetImpl(); } }; diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.cc b/src/GEOM_I/GEOM_IBasicOperations_i.cc index b24857da1..4257ae0a2 100644 --- a/src/GEOM_I/GEOM_IBasicOperations_i.cc +++ b/src/GEOM_I/GEOM_IBasicOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -136,6 +136,37 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakePointOnCurve return GetObject(anObject); } +//============================================================================= +/*! + * MakeTangentOnCurve + */ +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeTangentOnCurve + (GEOM::GEOM_Object_ptr theCurve, CORBA::Double theParameter) +{ + GEOM::GEOM_Object_var aGEOMObject; + + //Set a not done flag + GetOperations()->SetNotDone(); + + if (theCurve == NULL) return aGEOMObject._retn(); + + //Get the reference curve + + Handle(GEOM_Object) aRefernce = GetOperations()->GetEngine()->GetObject + (theCurve->GetStudyID(), theCurve->GetEntry()); + if (aRefernce.IsNull()) return aGEOMObject._retn(); + + //Create the point + + Handle(GEOM_Object) anObject = + GetOperations()->MakeTangentOnCurve(aRefernce, theParameter); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} + //============================================================================= /*! @@ -388,3 +419,39 @@ GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeMarker return GetObject(anObject); } + +//============================================================================= +/*! + * MakeTangentPlaneOnFace + */ +//============================================================================= + +GEOM::GEOM_Object_ptr GEOM_IBasicOperations_i::MakeTangentPlaneOnFace + (GEOM::GEOM_Object_ptr theFace, + CORBA::Double theParameterU, + CORBA::Double theParameterV, + CORBA::Double theTrimSize) +{ + GEOM::GEOM_Object_var aGEOMObject; + + //Set a not done flag + GetOperations()->SetNotDone(); + + if (theFace == NULL) return aGEOMObject._retn(); + + //Get the reference face + + Handle(GEOM_Object) aRef = GetOperations()->GetEngine()->GetObject + (theFace->GetStudyID(), theFace->GetEntry()); + if (aRef.IsNull()) return aGEOMObject._retn(); + + //Create the plane + + Handle(GEOM_Object) anObject = + GetOperations()->MakeTangentPlaneOnFace(aRef, theParameterU,theParameterV,theTrimSize); + if (!GetOperations()->IsDone() || anObject.IsNull()) + return aGEOMObject._retn(); + + return GetObject(anObject); +} + diff --git a/src/GEOM_I/GEOM_IBasicOperations_i.hh b/src/GEOM_I/GEOM_IBasicOperations_i.hh index 28edf9e49..9a54e2b96 100644 --- a/src/GEOM_I/GEOM_IBasicOperations_i.hh +++ b/src/GEOM_I/GEOM_IBasicOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IBasicOperations_i_HeaderFile @@ -53,6 +53,9 @@ class GEOM_I_EXPORT GEOM_IBasicOperations_i : GEOM::GEOM_Object_ptr MakePointOnCurve (GEOM::GEOM_Object_ptr theCurve, CORBA::Double theParameter); + GEOM::GEOM_Object_ptr MakeTangentOnCurve (GEOM::GEOM_Object_ptr theRefCurve, + CORBA::Double theParameter); + GEOM::GEOM_Object_ptr MakeVectorDXDYDZ (CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ); @@ -82,6 +85,11 @@ class GEOM_I_EXPORT GEOM_IBasicOperations_i : CORBA::Double theXDX, CORBA::Double theXDY, CORBA::Double theXDZ, CORBA::Double theYDX, CORBA::Double theYDY, CORBA::Double theYDZ); + GEOM::GEOM_Object_ptr MakeTangentPlaneOnFace (GEOM::GEOM_Object_ptr theFace, + CORBA::Double theParameterU, + CORBA::Double theParameterV, + CORBA::Double theTrimSize); + ::GEOMImpl_IBasicOperations* GetOperations() { return (::GEOMImpl_IBasicOperations*)GetImpl(); } }; diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.cc b/src/GEOM_I/GEOM_IBlocksOperations_i.cc index 97e693731..f8a1d2a20 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.cc +++ b/src/GEOM_I/GEOM_IBlocksOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM_I/GEOM_IBlocksOperations_i.hh b/src/GEOM_I/GEOM_IBlocksOperations_i.hh index 3d8dd7ce2..701b374dc 100644 --- a/src/GEOM_I/GEOM_IBlocksOperations_i.hh +++ b/src/GEOM_I/GEOM_IBlocksOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IBlocksOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.cc b/src/GEOM_I/GEOM_IBooleanOperations_i.cc index f69cce675..bbcf768ff 100644 --- a/src/GEOM_I/GEOM_IBooleanOperations_i.cc +++ b/src/GEOM_I/GEOM_IBooleanOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM_I/GEOM_IBooleanOperations_i.hh b/src/GEOM_I/GEOM_IBooleanOperations_i.hh index 84b86ead3..b6a9a61ce 100644 --- a/src/GEOM_I/GEOM_IBooleanOperations_i.hh +++ b/src/GEOM_I/GEOM_IBooleanOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IBooleanOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.cc b/src/GEOM_I/GEOM_ICurvesOperations_i.cc index 05baaeca8..d0c097ed4 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.cc +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM_I/GEOM_ICurvesOperations_i.hh b/src/GEOM_I/GEOM_ICurvesOperations_i.hh index 0b6babae5..e5c0b0fc0 100644 --- a/src/GEOM_I/GEOM_ICurvesOperations_i.hh +++ b/src/GEOM_I/GEOM_ICurvesOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_ICurvesOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.cc b/src/GEOM_I/GEOM_IGroupOperations_i.cc index e64e1b26d..e99524c98 100644 --- a/src/GEOM_I/GEOM_IGroupOperations_i.cc +++ b/src/GEOM_I/GEOM_IGroupOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM_I/GEOM_IGroupOperations_i.hh b/src/GEOM_I/GEOM_IGroupOperations_i.hh index 1e7aabe8b..505f16ee4 100644 --- a/src/GEOM_I/GEOM_IGroupOperations_i.hh +++ b/src/GEOM_I/GEOM_IGroupOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IGroupOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.cc b/src/GEOM_I/GEOM_IHealingOperations_i.cc index 30f823a51..a3dc9b4aa 100644 --- a/src/GEOM_I/GEOM_IHealingOperations_i.cc +++ b/src/GEOM_I/GEOM_IHealingOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM_I/GEOM_IHealingOperations_i.hh b/src/GEOM_I/GEOM_IHealingOperations_i.hh index acb75438b..53b9778cb 100644 --- a/src/GEOM_I/GEOM_IHealingOperations_i.hh +++ b/src/GEOM_I/GEOM_IHealingOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IHealingOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc index 7388c8269..01ffb311d 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.cc +++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifdef WNT #pragma warning( disable:4786 ) diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.hh b/src/GEOM_I/GEOM_IInsertOperations_i.hh index d9f8f6050..bd0941f4f 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.hh +++ b/src/GEOM_I/GEOM_IInsertOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IInsertOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.cc b/src/GEOM_I/GEOM_ILocalOperations_i.cc index f91cb437f..5b2430e9f 100644 --- a/src/GEOM_I/GEOM_ILocalOperations_i.cc +++ b/src/GEOM_I/GEOM_ILocalOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM_I/GEOM_ILocalOperations_i.hh b/src/GEOM_I/GEOM_ILocalOperations_i.hh index 5e7632e62..c8f4a6565 100644 --- a/src/GEOM_I/GEOM_ILocalOperations_i.hh +++ b/src/GEOM_I/GEOM_ILocalOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_ILocalOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.cc b/src/GEOM_I/GEOM_IMeasureOperations_i.cc index 1564bd5b7..c29bf81d2 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.cc +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -248,7 +248,7 @@ char* GEOM_IMeasureOperations_i::WhatIs (GEOM::GEOM_Object_ptr theShape) // Get shape parameters TCollection_AsciiString aDescription = GetOperations()->WhatIs(aShape); - return strdup(aDescription.ToCString()); + return CORBA::string_dup(aDescription.ToCString()); } //============================================================================= diff --git a/src/GEOM_I/GEOM_IMeasureOperations_i.hh b/src/GEOM_I/GEOM_IMeasureOperations_i.hh index 933817693..ff62a8bc9 100644 --- a/src/GEOM_I/GEOM_IMeasureOperations_i.hh +++ b/src/GEOM_I/GEOM_IMeasureOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IMeasureOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IOperations_i.cc b/src/GEOM_I/GEOM_IOperations_i.cc index b0f652b2e..f676df98c 100644 --- a/src/GEOM_I/GEOM_IOperations_i.cc +++ b/src/GEOM_I/GEOM_IOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_IOperations_i.hh" diff --git a/src/GEOM_I/GEOM_IOperations_i.hh b/src/GEOM_I/GEOM_IOperations_i.hh index 0a0894ff3..9ad5fca9a 100644 --- a/src/GEOM_I/GEOM_IOperations_i.hh +++ b/src/GEOM_I/GEOM_IOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.cc b/src/GEOM_I/GEOM_IShapesOperations_i.cc index 4c452deae..e26bc84ce 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.cc +++ b/src/GEOM_I/GEOM_IShapesOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -438,6 +438,76 @@ GEOM::GEOM_Object_ptr GEOM_IShapesOperations_i::GetSubShape return GetObject(anObject); } +//============================================================================= +/*! + * GetSubShapeIndex + */ +//============================================================================= +CORBA::Long GEOM_IShapesOperations_i::GetSubShapeIndex + (GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape) +{ + if (theMainShape == NULL || theSubShape == NULL) return -1; + + //Get the reference shapes + Handle(GEOM_Object) aMainShapeRef = GetOperations()->GetEngine()->GetObject + (theMainShape->GetStudyID(), theMainShape->GetEntry()); + Handle(GEOM_Object) aSubShapeRef = GetOperations()->GetEngine()->GetObject + (theSubShape->GetStudyID(), theSubShape->GetEntry()); + if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1; + + //Get the unique ID of inside + CORBA::Long anID = GetOperations()->GetSubShapeIndex(aMainShapeRef, aSubShapeRef); + if (!GetOperations()->IsDone()) + return -1; + + return anID; +} + +//============================================================================= +/*! + * GetTopologyIndex + */ +//============================================================================= +CORBA::Long GEOM_IShapesOperations_i::GetTopologyIndex + (GEOM::GEOM_Object_ptr theMainShape, GEOM::GEOM_Object_ptr theSubShape) +{ + if (theMainShape == NULL || theSubShape == NULL) return -1; + + //Get the reference shapes + Handle(GEOM_Object) aMainShapeRef = GetOperations()->GetEngine()->GetObject + (theMainShape->GetStudyID(), theMainShape->GetEntry()); + Handle(GEOM_Object) aSubShapeRef = GetOperations()->GetEngine()->GetObject + (theSubShape->GetStudyID(), theSubShape->GetEntry()); + if (aMainShapeRef.IsNull() || aSubShapeRef.IsNull()) return -1; + + //Get an ID of , unique among all sub-shapes of of the same type + CORBA::Long anID = GetOperations()->GetTopologyIndex(aMainShapeRef, aSubShapeRef); + if (!GetOperations()->IsDone()) + return -1; + + return anID; +} + +//============================================================================= +/*! + * GetShapeTypeString + */ +//============================================================================= +char* GEOM_IShapesOperations_i::GetShapeTypeString (GEOM::GEOM_Object_ptr theShape) +{ + if (theShape == NULL) return NULL; + + //Get the reference shape + Handle(GEOM_Object) aShape = GetOperations()->GetEngine()->GetObject + (theShape->GetStudyID(), theShape->GetEntry()); + + if (aShape.IsNull()) return NULL; + + // Get shape parameters + TCollection_AsciiString aDescription = GetOperations()->GetShapeTypeString(aShape); + return CORBA::string_dup(aDescription.ToCString()); +} + //============================================================================= /*! * NumberOfFaces diff --git a/src/GEOM_I/GEOM_IShapesOperations_i.hh b/src/GEOM_I/GEOM_IShapesOperations_i.hh index fc51c164a..5a2cc0cde 100644 --- a/src/GEOM_I/GEOM_IShapesOperations_i.hh +++ b/src/GEOM_I/GEOM_IShapesOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_IShapesOperations_i_HeaderFile @@ -74,6 +74,14 @@ class GEOM_I_EXPORT GEOM_IShapesOperations_i : GEOM::GEOM_Object_ptr GetSubShape (GEOM::GEOM_Object_ptr theMainShape, CORBA::Long theID); + CORBA::Long GetSubShapeIndex (GEOM::GEOM_Object_ptr theMainShape, + GEOM::GEOM_Object_ptr theSubShape); + + CORBA::Long GetTopologyIndex (GEOM::GEOM_Object_ptr theMainShape, + GEOM::GEOM_Object_ptr theSubShape); + + char* GetShapeTypeString (GEOM::GEOM_Object_ptr theShape); + CORBA::Long NumberOfFaces (GEOM::GEOM_Object_ptr theShape); CORBA::Long NumberOfEdges (GEOM::GEOM_Object_ptr theShape); diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.cc b/src/GEOM_I/GEOM_ITransformOperations_i.cc index d68c74492..abc3b362c 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.cc +++ b/src/GEOM_I/GEOM_ITransformOperations_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include diff --git a/src/GEOM_I/GEOM_ITransformOperations_i.hh b/src/GEOM_I/GEOM_ITransformOperations_i.hh index 6c3345d95..712b9d670 100644 --- a/src/GEOM_I/GEOM_ITransformOperations_i.hh +++ b/src/GEOM_I/GEOM_ITransformOperations_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_ITransformOperations_i_HeaderFile diff --git a/src/GEOM_I/GEOM_Object_i.cc b/src/GEOM_I/GEOM_Object_i.cc index 66e85cbf3..62aa57a71 100644 --- a/src/GEOM_I/GEOM_Object_i.cc +++ b/src/GEOM_I/GEOM_Object_i.cc @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include @@ -253,9 +253,9 @@ SALOMEDS::TMPFile* GEOM_Object_i::GetShapeStream() //function : getShape //purpose : return the TopoDS_Shape when client and servant are colocated, be careful //======================================================================= -long GEOM_Object_i::getShape() { +CORBA::Long GEOM_Object_i::getShape() { _geom = _impl->GetValue(); - return((long)(&_geom)); + return CORBA::Long(size_t(&_geom)); } //============================================================================= diff --git a/src/GEOM_I/GEOM_Object_i.hh b/src/GEOM_I/GEOM_Object_i.hh index d8a0f4b70..660f0399c 100644 --- a/src/GEOM_I/GEOM_Object_i.hh +++ b/src/GEOM_I/GEOM_Object_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _GEOM_Object_i_HeaderFile @@ -63,7 +63,7 @@ class GEOM_I_EXPORT GEOM_Object_i : public virtual POA_GEOM::GEOM_Object, public virtual SALOMEDS::TMPFile* GetShapeStream(); - long getShape(); + virtual CORBA::Long getShape(); virtual bool IsMainShape() { return _impl->IsMainShape(); } diff --git a/src/GEOM_I/Makefile.in b/src/GEOM_I/Makefile.in index 6cf1d5df1..dd6cdcf89 100644 --- a/src/GEOM_I/Makefile.in +++ b/src/GEOM_I/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -84,11 +84,11 @@ EXPORT_HEADERS = GEOM_Object_i.hh \ GEOM_Gen_i.hh # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) LDFLAGS += -lGEOMArchimede -lGEOMbasic -lGEOMimpl -lGEOMSketcher \ $(CAS_DATAEXCHANGE) $(CAS_LDPATH) -lTKFillet -lTKOffset \ - -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS + $(KERNEL_LDFLAGS) -lSalomeNS -lSalomeContainer -lSalomeGenericObj -lTOOLSDS # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOM_I_Superv/GEOM_List_i.hh b/src/GEOM_I_Superv/GEOM_List_i.hh index 765e381e8..7b8e56c75 100644 --- a/src/GEOM_I_Superv/GEOM_List_i.hh +++ b/src/GEOM_I_Superv/GEOM_List_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef __GEOM_LIST_I_H__ #define __GEOM_LIST_I_H__ diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc index 32b1589de..8dbfaf982 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.cc +++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc @@ -15,11 +15,17 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "GEOM_Superv_i.hh" #include "SALOME_LifeCycleCORBA.hxx" + +#include CORBA_SERVER_HEADER(SALOME_Session) +#include "SALOMEDSClient_ClientFactory.hxx" + +#define isNewStudy(a,b) (a > 0 && a != b) + using namespace std; //============================================================================= // constructor: @@ -44,6 +50,7 @@ GEOM_Superv_i::GEOM_Superv_i(CORBA::ORB_ptr orb, setGeomEngine(); myStudyID = -1; + myLastStudyID = -1; myBasicOp = GEOM::GEOM_IBasicOperations::_nil(); my3DPrimOp = GEOM::GEOM_I3DPrimOperations::_nil(); @@ -93,7 +100,43 @@ void GEOM_Superv_i::setGeomEngine() //============================================================================= void GEOM_Superv_i::SetStudyID( CORBA::Long theId ) { - myStudyID = theId; + // mkr : PAL10770 --> + myLastStudyID = myStudyID; + + CORBA::Object_ptr anObject = name_service->Resolve("/Kernel/Session"); + if ( !CORBA::is_nil(anObject) ) { + SALOME::Session_var aSession = SALOME::Session::_narrow(anObject); + if ( !CORBA::is_nil(aSession) ) { + int aStudyID = aSession->GetActiveStudyId(); + if ( theId != aStudyID && aStudyID > 0) { // mkr : IPAL12128 + MESSAGE("Warning : given study ID theId="<object_to_string( myGeomEngine ); + + CORBA::Object_var anObj = name_service->Resolve("/myStudyManager"); + if ( !CORBA::is_nil(anObj) ) { + SALOMEDS::StudyManager_var aStudyManager = SALOMEDS::StudyManager::_narrow(anObj); + if ( !CORBA::is_nil(aStudyManager) ) { + _PTR(Study) aDSStudy = ClientFactory::Study(aStudyManager->GetStudyByID(myStudyID)); + if ( aDSStudy ) { + _PTR(SComponent) aSCO = aDSStudy->FindComponent(myGeomEngine->ComponentDataType()); + if ( aSCO ) { + _PTR(StudyBuilder) aBuilder = aDSStudy->NewBuilder(); + if ( aBuilder ) aBuilder->LoadWith( aSCO, anEngine ); + } + } + } + } + } + // mkr : PAL10770 <-- } //============================================================================= @@ -134,7 +177,7 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::CreateListOfLong() // AddItemToListOfLong: //============================================================================= void GEOM_Superv_i::AddItemToListOfLong(GEOM::GEOM_List_ptr& theList, - long theObject) + CORBA::Long theObject) { MESSAGE("GEOM_Superv_i::AddItemToListOfLong(...)"); if (GEOM_List_i* aList = @@ -158,7 +201,7 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::CreateListOfDouble() // AddItemToListOfDouble: //============================================================================= void GEOM_Superv_i::AddItemToListOfDouble(GEOM::GEOM_List_ptr& theList, - double theObject) + CORBA::Double theObject) { MESSAGE("GEOM_Superv_i::AddItemToListOfDouble(...)"); if (GEOM_List_i* aList = @@ -176,7 +219,8 @@ void GEOM_Superv_i::getBasicOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_IBasicOperations interface - myBasicOp = myGeomEngine->GetIBasicOperations(myStudyID); + if (CORBA::is_nil(myBasicOp) || isNewStudy(myLastStudyID,myStudyID)) + myBasicOp = myGeomEngine->GetIBasicOperations(myStudyID); } //============================================================================= @@ -187,7 +231,8 @@ void GEOM_Superv_i::get3DPrimOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_I3DPrimOperations interface - my3DPrimOp = myGeomEngine->GetI3DPrimOperations(myStudyID); + if (CORBA::is_nil(my3DPrimOp) || isNewStudy(myLastStudyID,myStudyID)) + my3DPrimOp = myGeomEngine->GetI3DPrimOperations(myStudyID); } //============================================================================= @@ -198,7 +243,8 @@ void GEOM_Superv_i::getBoolOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_IBooleanOperations interface - myBoolOp = myGeomEngine->GetIBooleanOperations(myStudyID); + if (CORBA::is_nil(myBoolOp) || isNewStudy(myLastStudyID,myStudyID)) + myBoolOp = myGeomEngine->GetIBooleanOperations(myStudyID); } //============================================================================= @@ -209,7 +255,8 @@ void GEOM_Superv_i::getInsOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_IInsertOperations interface - myInsOp = myGeomEngine->GetIInsertOperations(myStudyID); + if (CORBA::is_nil(myInsOp) || isNewStudy(myLastStudyID,myStudyID)) + myInsOp = myGeomEngine->GetIInsertOperations(myStudyID); } //============================================================================= @@ -220,7 +267,8 @@ void GEOM_Superv_i::getTransfOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_ITransformOperations interface - myTransfOp = myGeomEngine->GetITransformOperations(myStudyID); + if (CORBA::is_nil(myTransfOp) || isNewStudy(myLastStudyID,myStudyID)) + myTransfOp = myGeomEngine->GetITransformOperations(myStudyID); } //============================================================================= @@ -231,7 +279,8 @@ void GEOM_Superv_i::getShapesOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_IShapesOperations interface - myShapesOp = myGeomEngine->GetIShapesOperations(myStudyID); + if (CORBA::is_nil(myShapesOp) || isNewStudy(myLastStudyID,myStudyID)) + myShapesOp = myGeomEngine->GetIShapesOperations(myStudyID); } //============================================================================= @@ -242,7 +291,8 @@ void GEOM_Superv_i::getBlocksOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_IBlocksOperations interface - myBlocksOp = myGeomEngine->GetIBlocksOperations(myStudyID); + if (CORBA::is_nil(myBlocksOp) || isNewStudy(myLastStudyID,myStudyID)) + myBlocksOp = myGeomEngine->GetIBlocksOperations(myStudyID); } //============================================================================= @@ -253,7 +303,8 @@ void GEOM_Superv_i::getCurvesOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_ICurvesOperations interface - myCurvesOp = myGeomEngine->GetICurvesOperations(myStudyID); + if (CORBA::is_nil(myCurvesOp) || isNewStudy(myLastStudyID,myStudyID)) + myCurvesOp = myGeomEngine->GetICurvesOperations(myStudyID); } //============================================================================= @@ -264,7 +315,8 @@ void GEOM_Superv_i::getLocalOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_ILocalOperations interface - myLocalOp = myGeomEngine->GetILocalOperations(myStudyID); + if (CORBA::is_nil(myLocalOp) || isNewStudy(myLastStudyID,myStudyID)) + myLocalOp = myGeomEngine->GetILocalOperations(myStudyID); } //============================================================================= @@ -275,7 +327,8 @@ void GEOM_Superv_i::getGroupOp() if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); // get GEOM_IGroupOperations interface - myGroupOp = myGeomEngine->GetIGroupOperations(myStudyID); + if (CORBA::is_nil(myGroupOp) || isNewStudy(myLastStudyID,myStudyID)) + myGroupOp = myGeomEngine->GetIGroupOperations(myStudyID); } //============================================================================= @@ -295,7 +348,7 @@ PortableServer::ServantBase_var GEOM_Superv_i::GetServant(CORBA::Object_ptr //============================================================================ SALOMEDS::TMPFile* GEOM_Superv_i::Save(SALOMEDS::SComponent_ptr theComponent, const char* theURL, - bool isMultiFile) + CORBA::Boolean isMultiFile) { SALOMEDS::TMPFile_var aStreamFile; return aStreamFile._retn(); @@ -307,7 +360,7 @@ SALOMEDS::TMPFile* GEOM_Superv_i::Save(SALOMEDS::SComponent_ptr theComponent, //============================================================================ SALOMEDS::TMPFile* GEOM_Superv_i::SaveASCII(SALOMEDS::SComponent_ptr theComponent, const char* theURL, - bool isMultiFile) + CORBA::Boolean isMultiFile) { SALOMEDS::TMPFile_var aStreamFile; return aStreamFile._retn(); @@ -320,7 +373,7 @@ SALOMEDS::TMPFile* GEOM_Superv_i::SaveASCII(SALOMEDS::SComponent_ptr theComponen CORBA::Boolean GEOM_Superv_i::Load(SALOMEDS::SComponent_ptr theComponent, const SALOMEDS::TMPFile& theStream, const char* theURL, - bool isMultiFile) + CORBA::Boolean isMultiFile) { return false; } @@ -332,7 +385,7 @@ CORBA::Boolean GEOM_Superv_i::Load(SALOMEDS::SComponent_ptr theComponent, CORBA::Boolean GEOM_Superv_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent, const SALOMEDS::TMPFile& theStream, const char* theURL, - bool isMultiFile) + CORBA::Boolean isMultiFile) { return false; } @@ -342,7 +395,8 @@ CORBA::Boolean GEOM_Superv_i::LoadASCII(SALOMEDS::SComponent_ptr theComponent, // purpose : //============================================================================ void GEOM_Superv_i::Close(SALOMEDS::SComponent_ptr theComponent) -{} +{ +} //============================================================================ // function : ComponentDataType() @@ -383,7 +437,7 @@ char* GEOM_Superv_i::LocalPersistentIDToIOR(SALOMEDS::SObject_ptr theSObject, // function : CanPublishInStudy // purpose : //============================================================================ -bool GEOM_Superv_i::CanPublishInStudy(CORBA::Object_ptr theIOR) +CORBA::Boolean GEOM_Superv_i::CanPublishInStudy(CORBA::Object_ptr theIOR) { if (CORBA::is_nil(myGeomEngine)) setGeomEngine(); @@ -453,7 +507,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointXYZ(CORBA::Double theX, CORBA::Double theZ) { MESSAGE("GEOM_Superv_i::MakePointXYZ"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); // make vertex and return return myBasicOp->MakePointXYZ(theX, theY, theZ); } @@ -467,7 +521,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointWithReference (GEOM::GEOM_Object_p CORBA::Double theZ) { MESSAGE("GEOM_Superv_i::MakePointWithReference"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); return myBasicOp->MakePointWithReference(theReference, theX, theY, theZ); } @@ -478,10 +532,21 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePointOnCurve (GEOM::GEOM_Object_ptr the CORBA::Double theParameter) { MESSAGE("GEOM_Superv_i::MakePointOnCurve"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); return myBasicOp->MakePointOnCurve(theRefCurve, theParameter); } +//============================================================================= +// MakeTangentOnCurve: +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeTangentOnCurve (GEOM::GEOM_Object_ptr theRefCurve, + CORBA::Double theParameter) +{ + MESSAGE("GEOM_Superv_i::MakeTangentOnCurve"); + getBasicOp(); + return myBasicOp->MakeTangentOnCurve(theRefCurve, theParameter); +} + //============================================================================= // MakeVectorDXDYDZ: //============================================================================= @@ -490,7 +555,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeVectorDXDYDZ (CORBA::Double theDX, CORBA::Double theDZ) { MESSAGE("GEOM_Superv_i::MakeVectorDXDYDZ"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); return myBasicOp->MakeVectorDXDYDZ(theDX, theDY, theDZ); } @@ -501,7 +566,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeVectorTwoPnt (GEOM::GEOM_Object_ptr the GEOM::GEOM_Object_ptr thePnt2) { MESSAGE("GEOM_Superv_i::MakeVector"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); return myBasicOp->MakeVectorTwoPnt(thePnt1, thePnt2); } @@ -512,7 +577,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeLineTwoPnt (GEOM::GEOM_Object_ptr thePn GEOM::GEOM_Object_ptr thePnt2) { MESSAGE("GEOM_Superv_i::MakeLineTwoPnt"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); return myBasicOp->MakeLineTwoPnt(thePnt1, thePnt2); } @@ -525,7 +590,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlaneThreePnt (GEOM::GEOM_Object_ptr th CORBA::Double theTrimSize) { MESSAGE("GEOM_Superv_i::MakePlaneThreePnt"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); return myBasicOp->MakePlaneThreePnt(thePnt1, thePnt2, thePnt3, theTrimSize); } @@ -537,7 +602,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlanePntVec (GEOM::GEOM_Object_ptr theP CORBA::Double theTrimSize) { MESSAGE("GEOM_Superv_i::MakePlanePntVec"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); return myBasicOp->MakePlanePntVec(thePnt, theVec, theTrimSize); } @@ -548,7 +613,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePlaneFace (GEOM::GEOM_Object_ptr theFac CORBA::Double theTrimSize) { MESSAGE("GEOM_Superv_i::MakePlaneFace"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); return myBasicOp->MakePlaneFace(theFace, theTrimSize); } @@ -561,10 +626,23 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMarker CORBA::Double theYDX, CORBA::Double theYDY, CORBA::Double theYDZ) { MESSAGE("GEOM_Superv_i::MakeMarker"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); + getBasicOp(); return myBasicOp->MakeMarker(theOX, theOY, theOZ, theXDX, theXDY, theXDZ, theYDX, theYDY, theYDZ); } +//============================================================================= +// MakeTangentPlaneOnFace: +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeTangentPlaneOnFace (GEOM::GEOM_Object_ptr theFace, + CORBA::Double theParameterU, + CORBA::Double theParameterV, + CORBA::Double theTrimSize) +{ + MESSAGE("GEOM_Superv_i::MakeTangentPlaneOnFace"); + getBasicOp(); + return myBasicOp->MakeTangentPlaneOnFace(theFace, theParameterU,theParameterV,theTrimSize); +} + //================= Primitives Construction : 3DPrimOperations ================ //============================================================================= // MakeBox: @@ -577,8 +655,8 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBox (CORBA::Double theX1, CORBA::Double theZ2) { MESSAGE("GEOM_Superv_i::MakeBox"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + getBasicOp(); + get3DPrimOp(); return my3DPrimOp->MakeBoxTwoPnt(myBasicOp->MakePointXYZ(theX1, theY1, theZ1), myBasicOp->MakePointXYZ(theX2, theY2, theZ2)); } @@ -591,7 +669,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoxDXDYDZ (CORBA::Double theDX, CORBA::Double theDZ) { MESSAGE("GEOM_Superv_i::MakeBoxDXDYDZ"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeBoxDXDYDZ(theDX, theDY, theDZ); } @@ -602,7 +680,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoxTwoPnt (GEOM::GEOM_Object_ptr thePnt GEOM::GEOM_Object_ptr thePnt2) { MESSAGE("GEOM_Superv_i::MakeBoxTwoPnt"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeBoxTwoPnt(thePnt1, thePnt2); } @@ -615,7 +693,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCylinderPntVecRH (GEOM::GEOM_Object_ptr CORBA::Double theHeight) { MESSAGE("GEOM_Superv_i::MakeCylinderPntVecRH"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeCylinderPntVecRH(thePnt, theAxis, theRadius, theHeight); } @@ -626,7 +704,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCylinderRH (CORBA::Double theR, CORBA::Double theH) { MESSAGE("GEOM_Superv_i::MakeCylinderRH"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeCylinderRH(theR, theH); } @@ -639,8 +717,8 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSphere (CORBA::Double theX, CORBA::Double theRadius) { MESSAGE("GEOM_Superv_i::MakeSphepe"); - if (CORBA::is_nil(myBasicOp)) getBasicOp(); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + getBasicOp(); + get3DPrimOp(); return my3DPrimOp->MakeSpherePntR(myBasicOp->MakePointXYZ(theX, theY, theZ), theRadius); } @@ -650,7 +728,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSphere (CORBA::Double theX, GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSphereR (CORBA::Double theR) { MESSAGE("GEOM_Superv_i::MakeSphereR"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeSphereR(theR); } @@ -661,7 +739,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSpherePntR (GEOM::GEOM_Object_ptr thePn CORBA::Double theR) { MESSAGE("GEOM_Superv_i::MakeSpherePntR"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeSpherePntR(thePnt, theR); } @@ -674,7 +752,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeTorusPntVecRR (GEOM::GEOM_Object_ptr th CORBA::Double theRMinor) { MESSAGE("GEOM_Superv_i::MakeTorusPntVecRR"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeTorusPntVecRR(thePnt, theVec, theRMajor, theRMinor); } @@ -685,7 +763,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeTorusRR (CORBA::Double theRMajor, CORBA::Double theRMinor) { MESSAGE("GEOM_Superv_i::MakeTorusRR"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeTorusRR(theRMajor, theRMinor); } @@ -699,7 +777,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeConePntVecR1R2H (GEOM::GEOM_Object_ptr CORBA::Double theHeight) { MESSAGE("GEOM_Superv_i::MakeConePntVecR1R2H"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeConePntVecR1R2H(thePnt, theAxis, theR1, theR2, theHeight); } @@ -711,7 +789,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeConeR1R2H (CORBA::Double theR1, CORBA::Double theHeight) { MESSAGE("GEOM_Superv_i::MakeConeR1R2H"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeConeR1R2H(theR1, theR2, theHeight); } @@ -723,7 +801,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismVecH (GEOM::GEOM_Object_ptr theBas CORBA::Double theH) { MESSAGE("GEOM_Superv_i::MakePrismVecH"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakePrismVecH(theBase, theVec, theH); } @@ -736,7 +814,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePrismTwoPnt (GEOM::GEOM_Object_ptr theB GEOM::GEOM_Object_ptr thePoint2) { MESSAGE("GEOM_Superv_i::MakePrismTwoPnt"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakePrismTwoPnt(theBase, thePoint1, thePoint2); } @@ -747,7 +825,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipe (GEOM::GEOM_Object_ptr theBase, GEOM::GEOM_Object_ptr thePath) { MESSAGE("GEOM_Superv_i::MakePipe"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakePipe(theBase, thePath); } @@ -759,7 +837,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeRevolutionAxisAngle (GEOM::GEOM_Object_ CORBA::Double theAngle) { MESSAGE("GEOM_Superv_i::MakeRevolutionAxisAngle"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeRevolutionAxisAngle(theBase, theAxis, theAngle); } @@ -772,7 +850,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilling (GEOM::GEOM_Object_ptr theShape CORBA::Long theNbIter) { MESSAGE("GEOM_Superv_i::MakeFilling"); - if (CORBA::is_nil(my3DPrimOp)) get3DPrimOp(); + get3DPrimOp(); return my3DPrimOp->MakeFilling(theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter); } @@ -787,10 +865,36 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeBoolean (GEOM::GEOM_Object_ptr theShape // theOperation indicates the operation to be done: // 1 - Common, 2 - Cut, 3 - Fuse, 4 - Section MESSAGE("GEOM_Superv_i::MakeBoolean"); - if (CORBA::is_nil(myBoolOp)) getBoolOp(); + getBoolOp(); return myBoolOp->MakeBoolean(theShape1, theShape2, theOperation); } +//============================================================================= +// MakeThruSections: +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeThruSections(const GEOM::ListOfGO& theSeqSections, + CORBA::Boolean theModeSolid, + CORBA::Double thePreci, + CORBA::Boolean theRuled) +{ + MESSAGE("GEOM_Superv_i::MakeThruSections"); + get3DPrimOp(); + return my3DPrimOp->MakeThruSections(theSeqSections, theModeSolid,thePreci,theRuled); +} + +//============================================================================= +// MakePipe: +//============================================================================= +GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePipeWithDifferentSections(const GEOM::ListOfGO& theBases, + const GEOM::ListOfGO& theLocations, + GEOM::GEOM_Object_ptr thePath, + CORBA::Boolean theWithContact, + CORBA::Boolean theWithCorrections) +{ + MESSAGE("GEOM_Superv_i::MakePipeWithDifferentSections"); + get3DPrimOp(); + return my3DPrimOp->MakePipeWithDifferentSections(theBases,theLocations, thePath,theWithContact,theWithCorrections); +} //============================================================================= // MakeFuse: //============================================================================= @@ -798,7 +902,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFuse (GEOM::GEOM_Object_ptr theShape1, GEOM::GEOM_Object_ptr theShape2) { MESSAGE("GEOM_Superv_i::MakeFuse"); - if (CORBA::is_nil(myBoolOp)) getBoolOp(); + getBoolOp(); return myBoolOp->MakeBoolean(theShape1, theShape2, 3); } @@ -825,7 +929,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePartition (GEOM::GEOM_List_ptr theSha GEOM_List_i* aListImplM = dynamic_cast*>(GetServant(theMaterials, myPOA).in()); if (aListImplS && aListImplT && aListImplKI && aListImplRI && aListImplM) { - if (CORBA::is_nil(myBoolOp)) getBoolOp(); + getBoolOp(); return myBoolOp->MakePartition(aListImplS->GetList(), aListImplT->GetList(), aListImplKI->GetList(), aListImplRI->GetList(), theLimit, theRemoveWebs, aListImplM->GetList()); @@ -840,7 +944,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeHalfPartition (GEOM::GEOM_Object_ptr th GEOM::GEOM_Object_ptr thePlane) { MESSAGE("GEOM_Superv_i::MakeHalfPartition"); - if (CORBA::is_nil(myBoolOp)) getBoolOp(); + getBoolOp(); return myBoolOp->MakeHalfPartition(theShape, thePlane); } @@ -851,7 +955,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeHalfPartition (GEOM::GEOM_Object_ptr th GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCopy (GEOM::GEOM_Object_ptr theOriginal) { MESSAGE("GEOM_Superv_i::MakeCopy"); - if (CORBA::is_nil(myInsOp)) getInsOp(); + getInsOp(); return myInsOp->MakeCopy(theOriginal); } @@ -863,7 +967,7 @@ void GEOM_Superv_i::Export (GEOM::GEOM_Object_ptr theObject, const char* theFormatName) { MESSAGE("GEOM_Superv_i::Export"); - if (CORBA::is_nil(myInsOp)) getInsOp(); + getInsOp(); myInsOp->Export(theObject, theFileName, theFormatName); } @@ -874,7 +978,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::Import (const char* theFileName, const char* theFormatName) { MESSAGE("GEOM_Superv_i::Import"); - if (CORBA::is_nil(myInsOp)) getInsOp(); + getInsOp(); return myInsOp->Import(theFileName, theFormatName); } @@ -885,7 +989,7 @@ void GEOM_Superv_i::ImportTranslators (GEOM::string_array_out theFormats, GEOM::string_array_out thePatterns) { MESSAGE("GEOM_Superv_i::ImportTranslators"); - if (CORBA::is_nil(myInsOp)) getInsOp(); + getInsOp(); myInsOp->ImportTranslators(theFormats, thePatterns); } @@ -896,7 +1000,7 @@ void GEOM_Superv_i::ExportTranslators (GEOM::string_array_out theFormats, GEOM::string_array_out thePatterns) { MESSAGE("GEOM_Superv_i::ExportTranslators"); - if (CORBA::is_nil(myInsOp)) getInsOp(); + getInsOp(); myInsOp->ExportTranslators(theFormats, thePatterns); } @@ -909,7 +1013,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateTwoPoints (GEOM::GEOM_Object_ptr t GEOM::GEOM_Object_ptr thePoint2) { MESSAGE("GEOM_Superv_i::TranslateTwoPoints"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->TranslateTwoPoints(theObject, thePoint1, thePoint2); } @@ -921,7 +1025,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateTwoPointsCopy (GEOM::GEOM_Object_p GEOM::GEOM_Object_ptr thePoint2) { MESSAGE("GEOM_Superv_i::TranslateTwoPointsCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->TranslateTwoPointsCopy(theObject, thePoint1, thePoint2); } @@ -934,7 +1038,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateDXDYDZ (GEOM::GEOM_Object_ptr theO CORBA::Double theDZ) { MESSAGE("GEOM_Superv_i::TranslateDXDYDZ"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->TranslateDXDYDZ(theObject, theDX, theDY, theDZ); } @@ -947,7 +1051,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateDXDYDZCopy (GEOM::GEOM_Object_ptr CORBA::Double theDZ) { MESSAGE("GEOM_Superv_i::TranslateDXDYDZCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->TranslateDXDYDZCopy(theObject, theDX, theDY, theDZ); } @@ -958,7 +1062,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateVector (GEOM::GEOM_Object_ptr theO GEOM::GEOM_Object_ptr theVector) { MESSAGE("GEOM_Superv_i::TranslateVector"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->TranslateVector(theObject, theVector); } @@ -969,7 +1073,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::TranslateVectorCopy (GEOM::GEOM_Object_ptr GEOM::GEOM_Object_ptr theVector) { MESSAGE("GEOM_Superv_i::TranslateVectorCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->TranslateVectorCopy(theObject, theVector); } @@ -982,7 +1086,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MultiTranslate1D (GEOM::GEOM_Object_ptr the CORBA::Long theNbTimes) { MESSAGE("GEOM_Superv_i::MultiTranslate1D"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MultiTranslate1D(theObject, theVector, theStep, theNbTimes); } @@ -998,7 +1102,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MultiTranslate2D (GEOM::GEOM_Object_ptr the CORBA::Long theNbTimes2) { MESSAGE("GEOM_Superv_i::MultiTranslate2D"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MultiTranslate2D(theObject, theVector1, theStep1, theNbTimes1, theVector2, theStep2, theNbTimes2); } @@ -1011,7 +1115,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::Rotate (GEOM::GEOM_Object_ptr theObject, CORBA::Double theAngle) { MESSAGE("GEOM_Superv_i::Rotate"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->Rotate(theObject, theAxis, theAngle); } @@ -1023,7 +1127,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::RotateCopy (GEOM::GEOM_Object_ptr theObject CORBA::Double theAngle) { MESSAGE("GEOM_Superv_i::RotateCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->RotateCopy(theObject, theAxis, theAngle); } @@ -1035,7 +1139,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MultiRotate1D (GEOM::GEOM_Object_ptr theObj CORBA::Long theNbTimes) { MESSAGE("GEOM_Superv_i::MultiRotate1D"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MultiRotate1D(theObject, theAxis, theNbTimes); } @@ -1050,7 +1154,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MultiRotate2D (GEOM::GEOM_Object_ptr theObj CORBA::Long theNbTimes2) { MESSAGE("GEOM_Superv_i::MultiRotate2D"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MultiRotate2D(theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2); } @@ -1061,7 +1165,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPlane (GEOM::GEOM_Object_ptr theObjec GEOM::GEOM_Object_ptr thePlane) { MESSAGE("GEOM_Superv_i::MirrorPlane"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MirrorPlane(theObject, thePlane); } @@ -1072,7 +1176,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPlaneCopy (GEOM::GEOM_Object_ptr theO GEOM::GEOM_Object_ptr thePlane) { MESSAGE("GEOM_Superv_i::MirrorPlaneCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MirrorPlaneCopy(theObject, thePlane); } @@ -1083,7 +1187,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorAxis (GEOM::GEOM_Object_ptr theObject GEOM::GEOM_Object_ptr theAxis) { MESSAGE("GEOM_Superv_i::MirrorAxis"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MirrorAxis(theObject, theAxis); } @@ -1094,7 +1198,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorAxisCopy (GEOM::GEOM_Object_ptr theOb GEOM::GEOM_Object_ptr theAxis) { MESSAGE("GEOM_Superv_i::MirrorAxisCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MirrorAxisCopy(theObject, theAxis); } @@ -1105,7 +1209,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPoint (GEOM::GEOM_Object_ptr theObjec GEOM::GEOM_Object_ptr thePoint) { MESSAGE("GEOM_Superv_i::MirrorPoint"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MirrorPoint(theObject, thePoint); } @@ -1116,7 +1220,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MirrorPointCopy (GEOM::GEOM_Object_ptr theO GEOM::GEOM_Object_ptr thePoint) { MESSAGE("GEOM_Superv_i::MirrorPointCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->MirrorPointCopy(theObject, thePoint); } @@ -1127,7 +1231,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShape (GEOM::GEOM_Object_ptr theObjec CORBA::Double theOffset) { MESSAGE("GEOM_Superv_i::OffsetShape"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->OffsetShape(theObject, theOffset); } @@ -1138,7 +1242,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::OffsetShapeCopy (GEOM::GEOM_Object_ptr theO CORBA::Double theOffset) { MESSAGE("GEOM_Superv_i::OffsetShapeCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->OffsetShapeCopy(theObject, theOffset); } @@ -1150,7 +1254,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShape (GEOM::GEOM_Object_ptr theObject CORBA::Double theFactor) { MESSAGE("GEOM_Superv_i::ScaleShape"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->ScaleShape(theObject, thePoint, theFactor); } @@ -1162,7 +1266,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::ScaleShapeCopy (GEOM::GEOM_Object_ptr theOb CORBA::Double theFactor) { MESSAGE("GEOM_Superv_i::ScaleShapeCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->ScaleShapeCopy(theObject, thePoint, theFactor); } @@ -1174,7 +1278,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::PositionShape (GEOM::GEOM_Object_ptr theObj GEOM::GEOM_Object_ptr theEndLCS) { MESSAGE("GEOM_Superv_i::PositionShape"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->PositionShape(theObject, theStartLCS, theEndLCS); } @@ -1186,7 +1290,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::PositionShapeCopy (GEOM::GEOM_Object_ptr th GEOM::GEOM_Object_ptr theEndLCS) { MESSAGE("GEOM_Superv_i::PositionShapeCopy"); - if (CORBA::is_nil(myTransfOp)) getTransfOp(); + getTransfOp(); return myTransfOp->PositionShapeCopy(theObject, theStartLCS, theEndLCS); } @@ -1198,7 +1302,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeEdge (GEOM::GEOM_Object_ptr thePnt1, GEOM::GEOM_Object_ptr thePnt2) { MESSAGE("GEOM_Superv_i::MakeEdge"); - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->MakeEdge(thePnt1, thePnt2); } @@ -1210,7 +1314,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeWire (GEOM::GEOM_List_ptr theEdgesAndWi MESSAGE("GEOM_Superv_i::MakeWire"); if (GEOM_List_i* aListImplEW = dynamic_cast*>(GetServant(theEdgesAndWires, myPOA).in())) { - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->MakeWire(aListImplEW->GetList()); } return NULL; @@ -1223,7 +1327,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFace (GEOM::GEOM_Object_ptr theWire, CORBA::Boolean isPlanarWanted) { MESSAGE("GEOM_Superv_i::MakeFace"); - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->MakeFace(theWire, isPlanarWanted); } @@ -1236,7 +1340,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFaceWires (GEOM::GEOM_List_ptr theWires MESSAGE("GEOM_Superv_i::MakeFaceWires"); if (GEOM_List_i* aListImplW = dynamic_cast*>(GetServant(theWires, myPOA).in())) { - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->MakeFaceWires(aListImplW->GetList(), isPlanarWanted); } return NULL; @@ -1250,7 +1354,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeShell (GEOM::GEOM_List_ptr theFacesAndS MESSAGE("GEOM_Superv_i::MakeShell"); if (GEOM_List_i* aListImplFS = dynamic_cast*>(GetServant(theFacesAndShells, myPOA).in())) { - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->MakeShell(aListImplFS->GetList()); } return NULL; @@ -1262,7 +1366,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeShell (GEOM::GEOM_List_ptr theFacesAndS GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSolidShell (GEOM::GEOM_Object_ptr theShell) { MESSAGE("GEOM_Superv_i::MakeSolidShell"); - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->MakeSolidShell(theShell); } @@ -1274,7 +1378,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSolidShells (GEOM::GEOM_List_ptr theShe MESSAGE("GEOM_Superv_i::MakeSolidShells"); if (GEOM_List_i* aListImplS = dynamic_cast*>(GetServant(theShells, myPOA).in())) { - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->MakeSolidShells(aListImplS->GetList()); } return NULL; @@ -1288,7 +1392,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCompound (GEOM::GEOM_List_ptr theShapes MESSAGE("GEOM_Superv_i::MakeCompound"); if (GEOM_List_i* aListImpl = dynamic_cast*>(GetServant(theShapes, myPOA).in())) { - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->MakeCompound(aListImpl->GetList()); } return NULL; @@ -1301,7 +1405,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeGlueFaces (GEOM::GEOM_Object_ptr theSha CORBA::Double theTolerance) { MESSAGE("GEOM_Superv_i::MakeGlueFaces"); - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->MakeGlueFaces(theShape, theTolerance); } @@ -1313,7 +1417,7 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakeExplode (GEOM::GEOM_Object_ptr theShape, CORBA::Boolean isSorted) { MESSAGE("GEOM_Superv_i::MakeExplode"); - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); GEOM::ListOfGO* aList = myShapesOp->MakeExplode(theShape, theShapeType, isSorted); GEOM_List_i* aListPtr = new GEOM_List_i(*(aList)); @@ -1327,7 +1431,7 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::MakeExplode (GEOM::GEOM_Object_ptr theShape, CORBA::Long GEOM_Superv_i::NumberOfFaces (GEOM::GEOM_Object_ptr theShape) { MESSAGE("GEOM_Superv_i::NumberOfFaces"); - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->NumberOfFaces(theShape); } @@ -1337,7 +1441,7 @@ CORBA::Long GEOM_Superv_i::NumberOfFaces (GEOM::GEOM_Object_ptr theShape) CORBA::Long GEOM_Superv_i::NumberOfEdges (GEOM::GEOM_Object_ptr theShape) { MESSAGE("GEOM_Superv_i::NumberOfEdges"); - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->NumberOfEdges(theShape); } @@ -1347,7 +1451,7 @@ CORBA::Long GEOM_Superv_i::NumberOfEdges (GEOM::GEOM_Object_ptr theShape) GEOM::GEOM_Object_ptr GEOM_Superv_i::ChangeOrientation (GEOM::GEOM_Object_ptr theShape) { MESSAGE("GEOM_Superv_i::ChangeOrientation"); - if (CORBA::is_nil(myShapesOp)) getShapesOp(); + getShapesOp(); return myShapesOp->ChangeOrientation(theShape); } @@ -1362,7 +1466,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeQuad4Vertices (GEOM::GEOM_Object_ptr th GEOM::GEOM_Object_ptr thePnt4) { MESSAGE("GEOM_Superv_i::MakeQuad4Vertices"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->MakeQuad4Vertices(thePnt1, thePnt2, thePnt3, thePnt4); } @@ -1375,7 +1479,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeQuad (GEOM::GEOM_Object_ptr theEdge1, GEOM::GEOM_Object_ptr theEdge4) { MESSAGE("GEOM_Superv_i::MakeQuad"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->MakeQuad(theEdge1, theEdge2, theEdge3, theEdge4); } @@ -1386,7 +1490,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeQuad2Edges (GEOM::GEOM_Object_ptr theEd GEOM::GEOM_Object_ptr theEdge2) { MESSAGE("GEOM_Superv_i::MakeQuad2Edges"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->MakeQuad2Edges(theEdge1, theEdge2); } @@ -1401,7 +1505,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeHexa (GEOM::GEOM_Object_ptr theFace1, GEOM::GEOM_Object_ptr theFace6) { MESSAGE("GEOM_Superv_i::MakeHexa"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->MakeHexa(theFace1, theFace2, theFace3, theFace4, theFace5, theFace6); } @@ -1412,7 +1516,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeHexa2Faces (GEOM::GEOM_Object_ptr theFa GEOM::GEOM_Object_ptr theFace2) { MESSAGE("GEOM_Superv_i::MakeHexa2Faces"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->MakeHexa2Faces(theFace1, theFace2); } @@ -1426,7 +1530,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetPoint (GEOM::GEOM_Object_ptr theShape, CORBA::Double theEpsilon) { MESSAGE("GEOM_Superv_i::GetPoint"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetPoint(theShape, theX, theY, theZ, theEpsilon); } @@ -1438,7 +1542,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetEdge (GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr thePoint2) { MESSAGE("GEOM_Superv_i::GetEdge"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetEdge(theShape, thePoint1, thePoint2); } @@ -1449,7 +1553,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetEdgeNearPoint (GEOM::GEOM_Object_ptr the GEOM::GEOM_Object_ptr thePoint) { MESSAGE("GEOM_Superv_i::GetEdgeNearPoint"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetEdgeNearPoint(theShape, thePoint); } @@ -1463,7 +1567,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetFaceByPoints (GEOM::GEOM_Object_ptr theS GEOM::GEOM_Object_ptr thePoint4) { MESSAGE("GEOM_Superv_i::GetFaceByPoints"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetFaceByPoints(theShape, thePoint1, thePoint2, thePoint3, thePoint4); } @@ -1475,7 +1579,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetFaceByEdges (GEOM::GEOM_Object_ptr theSh GEOM::GEOM_Object_ptr theEdge2) { MESSAGE("GEOM_Superv_i::GetFaceByEdges"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetFaceByEdges(theShape, theEdge1, theEdge2); } @@ -1486,7 +1590,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetOppositeFace (GEOM::GEOM_Object_ptr theB GEOM::GEOM_Object_ptr theFace) { MESSAGE("GEOM_Superv_i::GetOppositeFace"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetOppositeFace(theBlock, theFace); } @@ -1497,7 +1601,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetFaceNearPoint (GEOM::GEOM_Object_ptr the GEOM::GEOM_Object_ptr thePoint) { MESSAGE("GEOM_Superv_i::GetFaceNearPoint"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetFaceNearPoint(theShape, thePoint); } @@ -1508,7 +1612,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetFaceByNormale (GEOM::GEOM_Object_ptr the GEOM::GEOM_Object_ptr theVector) { MESSAGE("GEOM_Superv_i::GetFaceByNormale"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetFaceByNormale(theBlock, theVector); } @@ -1521,7 +1625,7 @@ CORBA::Boolean GEOM_Superv_i::IsCompoundOfBlocks (GEOM::GEOM_Object_ptr theCompo CORBA::Long& theNbBlocks) { MESSAGE("GEOM_Superv_i::IsCompoundOfBlocks"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->IsCompoundOfBlocks(theCompound, theMinNbFaces, theMaxNbFaces, theNbBlocks); } @@ -1533,7 +1637,7 @@ CORBA::Boolean GEOM_Superv_i::CheckCompoundOfBlocks GEOM::GEOM_IBlocksOperations::BCErrors_out theErrors) { MESSAGE("GEOM_Superv_i::CheckCompoundOfBlocks"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->CheckCompoundOfBlocks(theCompound, theErrors); } @@ -1544,7 +1648,7 @@ char* GEOM_Superv_i::PrintBCErrors (GEOM::GEOM_Object_ptr theCompound, const GEOM::GEOM_IBlocksOperations::BCErrors& theErrors) { MESSAGE("GEOM_Superv_i::PrintBCErrors"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->PrintBCErrors(theCompound, theErrors); } @@ -1556,7 +1660,7 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::ExplodeCompoundOfBlocks (GEOM::GEOM_Object_pt CORBA::Long theMaxNbFaces) { MESSAGE("GEOM_Superv_i::ExplodeCompoundOfBlocks"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); GEOM::ListOfGO* aBlocks = myBlocksOp->ExplodeCompoundOfBlocks(theCompound, theMinNbFaces, theMaxNbFaces); GEOM_List_i* aListPtr = new GEOM_List_i(*(aBlocks)); return aListPtr->_this(); @@ -1569,7 +1673,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetBlockNearPoint (GEOM::GEOM_Object_ptr th GEOM::GEOM_Object_ptr thePoint) { MESSAGE("GEOM_Superv_i::GetBlockNearPoint"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetBlockNearPoint(theCompound, thePoint); } @@ -1582,7 +1686,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetBlockByParts (GEOM::GEOM_Object_ptr theC MESSAGE("GEOM_Superv_i::GetBlockByParts"); if (GEOM_List_i* aListImplP = dynamic_cast*>(GetServant(theParts, myPOA).in())) { - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->GetBlockByParts(theCompound, aListImplP->GetList()); } return NULL; @@ -1597,7 +1701,7 @@ GEOM::GEOM_List_ptr GEOM_Superv_i::GetBlocksByParts (GEOM::GEOM_Object_ptr theCo MESSAGE("GEOM_Superv_i::GetBlocksByParts"); if (GEOM_List_i* aListImplP = dynamic_cast*>(GetServant(theParts, myPOA).in())) { - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); GEOM::ListOfGO* aBlocks = myBlocksOp->GetBlocksByParts(theCompound, aListImplP->GetList()); GEOM_List_i* aListPtr = new GEOM_List_i(*(aBlocks)); @@ -1615,7 +1719,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMultiTransformation1D (GEOM::GEOM_Objec CORBA::Long theNbTimes) { MESSAGE("GEOM_Superv_i::MakeMultiTransformation1D"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->MakeMultiTransformation1D(theBlock, theDirFace1, theDirFace2, theNbTimes); } @@ -1632,7 +1736,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeMultiTransformation2D CORBA::Long theNbTimesV) { MESSAGE("GEOM_Superv_i::MakeMultiTransformation2D"); - if (CORBA::is_nil(myBlocksOp)) getBlocksOp(); + getBlocksOp(); return myBlocksOp->MakeMultiTransformation2D(theBlock, theDirFace1U, theDirFace2U, theNbTimesU, theDirFace1V, theDirFace2V, theNbTimesV); @@ -1647,7 +1751,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCirclePntVecR (GEOM::GEOM_Object_ptr th CORBA::Double theR) { MESSAGE("GEOM_Superv_i::MakeCirclePntVecR"); - if (CORBA::is_nil(myCurvesOp)) getCurvesOp(); + getCurvesOp(); return myCurvesOp->MakeCirclePntVecR(theCenter, theVector, theR); } @@ -1659,7 +1763,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeCircleThreePnt (GEOM::GEOM_Object_ptr t GEOM::GEOM_Object_ptr thePnt3) { MESSAGE("GEOM_Superv_i::MakeCircleThreePnt"); - if (CORBA::is_nil(myCurvesOp)) getCurvesOp(); + getCurvesOp(); return myCurvesOp->MakeCircleThreePnt(thePnt1, thePnt2, thePnt3); } @@ -1672,7 +1776,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeEllipse (GEOM::GEOM_Object_ptr theCente CORBA::Double theRMinor) { MESSAGE("GEOM_Superv_i::MakeEllipse"); - if (CORBA::is_nil(myCurvesOp)) getCurvesOp(); + getCurvesOp(); return myCurvesOp->MakeEllipse(theCenter, theVector, theRMajor, theRMinor); } @@ -1684,7 +1788,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeArc (GEOM::GEOM_Object_ptr thePnt1, GEOM::GEOM_Object_ptr thePnt3) { MESSAGE("GEOM_Superv_i::MakeArc"); - if (CORBA::is_nil(myCurvesOp)) getCurvesOp(); + getCurvesOp(); return myCurvesOp->MakeArc(thePnt1, thePnt2, thePnt3); } @@ -1696,7 +1800,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakePolyline (GEOM::GEOM_List_ptr thePoints MESSAGE("GEOM_Superv_i::MakePolyline"); if (GEOM_List_i* aListImplP = dynamic_cast*>(GetServant(thePoints, myPOA).in())) { - if (CORBA::is_nil(myCurvesOp)) getCurvesOp(); + getCurvesOp(); return myCurvesOp->MakePolyline(aListImplP->GetList()); } return NULL; @@ -1710,7 +1814,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSplineBezier (GEOM::GEOM_List_ptr thePo MESSAGE("GEOM_Superv_i::MakeSplineBezier"); if (GEOM_List_i* aListImplP = dynamic_cast*>(GetServant(thePoints, myPOA).in())) { - if (CORBA::is_nil(myCurvesOp)) getCurvesOp(); + getCurvesOp(); return myCurvesOp->MakeSplineBezier(aListImplP->GetList()); } return NULL; @@ -1724,7 +1828,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSplineInterpolation (GEOM::GEOM_List_pt MESSAGE("GEOM_Superv_i::MakeSplineInterpolation"); if (GEOM_List_i* aListImplP = dynamic_cast*>(GetServant(thePoints, myPOA).in())) { - if (CORBA::is_nil(myCurvesOp)) getCurvesOp(); + getCurvesOp(); return myCurvesOp->MakeSplineInterpolation(aListImplP->GetList()); } return NULL; @@ -1739,7 +1843,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeSketcher (const char* theCommand, MESSAGE("GEOM_Superv_i::MakeSketcher"); if (GEOM_List_i* aListImplWP = dynamic_cast*>(GetServant(theWorkingPlane, myPOA).in())) { - if (CORBA::is_nil(myCurvesOp)) getCurvesOp(); + getCurvesOp(); return myCurvesOp->MakeSketcher(theCommand, aListImplWP->GetList()); } return NULL; @@ -1753,7 +1857,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletAll (GEOM::GEOM_Object_ptr theSha CORBA::Double theR) { MESSAGE("GEOM_Superv_i::MakeFilletAllMakeSketcher"); - if (CORBA::is_nil(myLocalOp)) getLocalOp(); + getLocalOp(); return myLocalOp->MakeFilletAll(theShape, theR); } @@ -1767,7 +1871,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletEdges (GEOM::GEOM_Object_ptr theS MESSAGE("GEOM_Superv_i::MakeFilletEdges"); if (GEOM_List_i* aListImplE = dynamic_cast*>(GetServant(theEdges, myPOA).in())) { - if (CORBA::is_nil(myLocalOp)) getLocalOp(); + getLocalOp(); return myLocalOp->MakeFilletEdges(theShape, theR, aListImplE->GetList()); } return NULL; @@ -1783,7 +1887,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletFaces (GEOM::GEOM_Object_ptr theS MESSAGE("GEOM_Superv_i::MakeFilletFaces"); if (GEOM_List_i* aListImplF = dynamic_cast*>(GetServant(theFaces, myPOA).in())) { - if (CORBA::is_nil(myLocalOp)) getLocalOp(); + getLocalOp(); return myLocalOp->MakeFilletFaces(theShape, theR, aListImplF->GetList()); } return NULL; @@ -1795,7 +1899,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeFilletFaces (GEOM::GEOM_Object_ptr theS GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeChamferAll (GEOM::GEOM_Object_ptr theShape, CORBA::Double theD) { MESSAGE("GEOM_Superv_i::MakeChamferAll"); - if (CORBA::is_nil(myLocalOp)) getLocalOp(); + getLocalOp(); return myLocalOp->MakeChamferAll(theShape, theD); } @@ -1807,7 +1911,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeChamferEdge (GEOM::GEOM_Object_ptr theS CORBA::Long theFace1, CORBA::Long theFace2) { MESSAGE("GEOM_Superv_i::MakeChamferEdge"); - if (CORBA::is_nil(myLocalOp)) getLocalOp(); + getLocalOp(); return myLocalOp->MakeChamferEdge(theShape, theD1, theD2, theFace1, theFace2); } @@ -1821,7 +1925,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeChamferFaces (GEOM::GEOM_Object_ptr the MESSAGE("GEOM_Superv_i::MakeChamferFaces"); if (GEOM_List_i* aListImplF = dynamic_cast*>(GetServant(theFaces, myPOA).in())) { - if (CORBA::is_nil(myLocalOp)) getLocalOp(); + getLocalOp(); return myLocalOp->MakeChamferFaces(theShape, theD1, theD2, aListImplF->GetList()); } return NULL; @@ -1836,7 +1940,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::MakeArchimede (GEOM::GEOM_Object_ptr theSha CORBA::Double theMeshingDeflection) { MESSAGE("GEOM_Superv_i::MakeArchimede"); - if (CORBA::is_nil(myLocalOp)) getLocalOp(); + getLocalOp(); return myLocalOp->MakeArchimede(theShape, theWeight, theWaterDensity, theMeshingDeflection); } @@ -1847,7 +1951,7 @@ CORBA::Long GEOM_Superv_i::GetSubShapeIndex (GEOM::GEOM_Object_ptr theShape, GEOM::GEOM_Object_ptr theSubShape) { MESSAGE("GEOM_Superv_i::GetSubShapeIndexMakeArchimede"); - if (CORBA::is_nil(myLocalOp)) getLocalOp(); + getLocalOp(); return myLocalOp->GetSubShapeIndex(theShape, theSubShape); } @@ -1859,7 +1963,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::CreateGroup (GEOM::GEOM_Object_ptr theMainS CORBA::Long theShapeType) { MESSAGE("GEOM_Superv_i::CreateGroup"); - if (CORBA::is_nil(myGroupOp)) getGroupOp(); + getGroupOp(); return myGroupOp->CreateGroup(theMainShape, theShapeType); } @@ -1870,7 +1974,7 @@ void GEOM_Superv_i::AddObject (GEOM::GEOM_Object_ptr theGroup, CORBA::Long theSubShapeId) { MESSAGE("GEOM_Superv_i::AddObject"); - if (CORBA::is_nil(myGroupOp)) getGroupOp(); + getGroupOp(); myGroupOp->AddObject(theGroup, theSubShapeId); } @@ -1881,7 +1985,7 @@ void GEOM_Superv_i::RemoveObject (GEOM::GEOM_Object_ptr theGroup, CORBA::Long theSubShapeId) { MESSAGE("GEOM_Superv_i::RemoveObject"); - if (CORBA::is_nil(myGroupOp)) getGroupOp(); + getGroupOp(); myGroupOp->RemoveObject(theGroup, theSubShapeId); } @@ -1891,7 +1995,7 @@ void GEOM_Superv_i::RemoveObject (GEOM::GEOM_Object_ptr theGroup, CORBA::Long GEOM_Superv_i::GetType (GEOM::GEOM_Object_ptr theGroup) { MESSAGE("GEOM_Superv_i::GetType"); - if (CORBA::is_nil(myGroupOp)) getGroupOp(); + getGroupOp(); return myGroupOp->GetType(theGroup); } @@ -1901,7 +2005,7 @@ CORBA::Long GEOM_Superv_i::GetType (GEOM::GEOM_Object_ptr theGroup) GEOM::GEOM_Object_ptr GEOM_Superv_i::GetMainShape (GEOM::GEOM_Object_ptr theGroup) { MESSAGE("GEOM_Superv_i::GetMainShape"); - if (CORBA::is_nil(myGroupOp)) getGroupOp(); + getGroupOp(); return myGroupOp->GetMainShape(theGroup); } @@ -1911,7 +2015,7 @@ GEOM::GEOM_Object_ptr GEOM_Superv_i::GetMainShape (GEOM::GEOM_Object_ptr theGrou GEOM::GEOM_List_ptr GEOM_Superv_i::GetObjects (GEOM::GEOM_Object_ptr theGroup) { MESSAGE("GEOM_Superv_i::GetObjects"); - if (CORBA::is_nil(myGroupOp)) getGroupOp(); + getGroupOp(); GEOM::ListOfLong* aList = myGroupOp->GetObjects(theGroup); GEOM_List_i* aListPtr = new GEOM_List_i(*(aList)); diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh index 4abb6e257..87422e14d 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.hh +++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef __GEOM_SUPERV_I_H__ #define __GEOM_SUPERV_I_H__ @@ -66,21 +66,21 @@ public: //-----------------------------------------------------------// GEOM::GEOM_List_ptr CreateListOfGO(); void AddItemToListOfGO(GEOM::GEOM_List_ptr& theList, - GEOM::GEOM_Object_ptr theObject); + GEOM::GEOM_Object_ptr theObject); //-----------------------------------------------------------// // Create ListOfLong and add items to it // //-----------------------------------------------------------// GEOM::GEOM_List_ptr CreateListOfLong(); void AddItemToListOfLong(GEOM::GEOM_List_ptr& theList, - long theObject); + CORBA::Long theObject); //-----------------------------------------------------------// // Create ListOfDouble and add items to it // //-----------------------------------------------------------// GEOM::GEOM_List_ptr CreateListOfDouble(); void AddItemToListOfDouble(GEOM::GEOM_List_ptr& theList, - double theObject); + CORBA::Double theObject); //-----------------------------------------------------------------------// // Inherited methods from SALOMEDS::Driver // @@ -88,21 +88,21 @@ public: SALOMEDS::TMPFile* Save(SALOMEDS::SComponent_ptr theComponent, const char* theURL, - bool isMultiFile); + CORBA::Boolean isMultiFile); SALOMEDS::TMPFile* SaveASCII(SALOMEDS::SComponent_ptr theComponent, const char* theURL, - bool isMultiFile); + CORBA::Boolean isMultiFile); CORBA::Boolean Load(SALOMEDS::SComponent_ptr theComponent, const SALOMEDS::TMPFile& theStream, const char* theURL, - bool isMultiFile); + CORBA::Boolean isMultiFile); CORBA::Boolean LoadASCII(SALOMEDS::SComponent_ptr theComponent, const SALOMEDS::TMPFile& theStream, const char* theURL, - bool isMultiFile); + CORBA::Boolean isMultiFile); void Close(SALOMEDS::SComponent_ptr theComponent); char* ComponentDataType(); @@ -117,7 +117,7 @@ public: CORBA::Boolean isMultiFile, CORBA::Boolean isASCII); - bool CanPublishInStudy(CORBA::Object_ptr theIOR); + CORBA::Boolean CanPublishInStudy(CORBA::Object_ptr theIOR); SALOMEDS::SObject_ptr PublishInStudy(SALOMEDS::Study_ptr theStudy, SALOMEDS::SObject_ptr theSObject, CORBA::Object_ptr theObject, @@ -142,6 +142,8 @@ public: CORBA::Double theZ); GEOM::GEOM_Object_ptr MakePointOnCurve (GEOM::GEOM_Object_ptr theRefCurve, CORBA::Double theParameter); + GEOM::GEOM_Object_ptr MakeTangentOnCurve (GEOM::GEOM_Object_ptr theRefCurve, + CORBA::Double theParameter); GEOM::GEOM_Object_ptr MakeVectorDXDYDZ (CORBA::Double theDX, CORBA::Double theDY, CORBA::Double theDZ); @@ -162,6 +164,11 @@ public: CORBA::Double theXDX, CORBA::Double theXDY, CORBA::Double theXDZ, CORBA::Double theYDX, CORBA::Double theYDY, CORBA::Double theYDZ); + GEOM::GEOM_Object_ptr MakeTangentPlaneOnFace (GEOM::GEOM_Object_ptr theFace, + CORBA::Double theParameterU, + CORBA::Double theParameterV, + CORBA::Double theTrimSize); + //-----------------------------------------------------------// // Primitives Construction : 3DPrimOperations // //-----------------------------------------------------------// @@ -218,6 +225,17 @@ public: CORBA::Long theMinDeg, CORBA::Long theMaxDeg, CORBA::Double theTol2D, CORBA::Double theTol3D, CORBA::Long theNbIter); + + GEOM::GEOM_Object_ptr MakeThruSections(const GEOM::ListOfGO& theSeqSections, + CORBA::Boolean theModeSolid, + CORBA::Double thePreci, + CORBA::Boolean theRuled); + + GEOM::GEOM_Object_ptr MakePipeWithDifferentSections(const GEOM::ListOfGO& theBases, + const GEOM::ListOfGO& theLocations, + GEOM::GEOM_Object_ptr thePath, + CORBA::Boolean theWithContact, + CORBA::Boolean theWithCorrections); //-----------------------------------------------------------// // BooleanOperations // @@ -485,6 +503,7 @@ private: SALOME_NamingService * name_service; GEOM::GEOM_Gen_ptr myGeomEngine; CORBA::Long myStudyID; + CORBA::Long myLastStudyID; // mkr : PAL10770 PortableServer::POA_var myPOA; GEOM::GEOM_IBasicOperations_ptr myBasicOp; diff --git a/src/GEOM_I_Superv/Makefile.in b/src/GEOM_I_Superv/Makefile.in index 90ab6307f..5657aa070 100644 --- a/src/GEOM_I_Superv/Makefile.in +++ b/src/GEOM_I_Superv/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -40,7 +40,7 @@ LIB_SRC = \ GEOM_Superv_i.cc LIB_SERVER_IDL = SALOMEDS.idl SALOMEDS_Attributes.idl SALOME_Component.idl SALOME_Exception.idl \ - SALOME_GenericObj.idl SALOME_ModuleCatalog.idl GEOM_Gen.idl GEOM_Superv.idl \ + SALOME_GenericObj.idl SALOME_ModuleCatalog.idl SALOME_Session.idl GEOM_Gen.idl GEOM_Superv.idl \ # Executables targets BIN = @@ -51,9 +51,9 @@ BIN_SERVER_IDL = EXPORT_HEADERS = # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome $(BOOST_CPPFLAGS) -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += -lGEOMEngine -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer -L${KERNEL_ROOT_DIR}/lib/salome -lSalomeGenericObj +CPPFLAGS += $(OCC_INCLUDES) $(QT_INCLUDES) $(KERNEL_CXXFLAGS) $(BOOST_CPPFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += -lGEOMEngine -lSalomeNS -lSalomeLifeCycleCORBA -lSalomeContainer $(KERNEL_LDFLAGS) -lSalomeGenericObj # additional file to be cleaned MOSTLYCLEAN = diff --git a/src/GEOM_SWIG/GEOM_Nut.py b/src/GEOM_SWIG/GEOM_Nut.py index c3d2db429..3a1f90adb 100755 --- a/src/GEOM_SWIG/GEOM_Nut.py +++ b/src/GEOM_SWIG/GEOM_Nut.py @@ -1,68 +1,87 @@ -##################################################################### -#Created :17/02/2005 -#Auhtor :MASLOV Eugeny, KOVALTCHUK Alexey -##################################################################### - -import geompy -import salome -import os -import math - -#Sketcher_1 creation -Sketcher_1 = geompy.MakeSketcher("Sketcher:F 100 -57.7:TT 100 57.7:TT 0 115.47:TT -100 57.7:TT -100 -57.7:TT 0 -115.47:WW") -geompy.addToStudy(Sketcher_1, "Sketcher_1") -Face_1 = geompy.MakeFace(Sketcher_1, 1) -geompy.addToStudy(Face_1, "Face_1") - -#Line creation -Line_1 = geompy.MakeLineTwoPnt(geompy.MakeVertex(0,0,0), geompy.MakeVertex(0,0,100)) -geompy.addToStudy(Line_1, "Line_1") - -#Prism creation -Prism_1 = geompy.MakePrismVecH(Face_1, Line_1, 100) -geompy.addToStudy(Prism_1, "Prism_1") - -#Sketcher_2 creation -Sketcher_2 = geompy.MakeSketcher("Sketcher:F 50 0:TT 80 0:TT 112 13:TT 112 48:TT 80 63:TT 80 90:TT 50 90:WW", [0,0,0, 1,0,0, 0,1,0]) -geompy.addToStudy(Sketcher_2, "Sketcher_2") -Face_2 = geompy.MakeFace(Sketcher_2, 1) -geompy.addToStudy(Face_2, "Face_2") - -#Revolution creation -Revolution_1 = geompy.MakeRevolution(Face_2, Line_1, 2*math.pi) -geompy.addToStudy(Revolution_1, "Revolution_1") - -#Common applying -Common_1 = geompy.MakeBoolean(Revolution_1, Prism_1, 1) -geompy.addToStudy(Common_1, "Common_1") - -#Explode Common_1 on edges -CommonExplodedListEdges = geompy.SubShapeAll(Common_1, geompy.ShapeType["EDGE"]) -for i in range(0, len(CommonExplodedListEdges)): - name = "Edge_"+str(i+1) - geompy.addToStudyInFather(Common_1, CommonExplodedListEdges[i], name) - -#Fillet applying -#ID = geompy.GetSubShapeID(Common_1, CommonExplodedListEdges[0]) -Fillet_1 = geompy.MakeFillet(Common_1, 10, geompy.ShapeType["EDGE"], [6]) -geompy.addToStudy(Fillet_1, "Fillet_1") - -#Chamfer applying -Chamfer_1 = geompy.MakeChamferEdge(Fillet_1, 10, 10, 16, 50 ) -geompy.addToStudy(Chamfer_1, "Chamfer_1") - -Chamfer_2 = geompy.MakeChamferEdge(Chamfer_1, 10, 10, 21, 31 ) -geompy.addToStudy(Chamfer_2, "Chamfer_2") - -#Import of the shape from "slots.brep" -thePath = os.getenv("DATA_DIR") -theFileName = thePath + "/Shapes/Brep/slots.brep" -theShapeForCut = geompy.ImportBREP(theFileName) -geompy.addToStudy(theShapeForCut, "slot.brep_1") - -#Cut applying -Cut_1 = geompy.MakeBoolean(Chamfer_2, theShapeForCut, 2) -geompy.addToStudy(Cut_1, "Cut_1") - -salome.sg.updateObjBrowser(1) - +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +##################################################################### +#Created :17/02/2005 +#Auhtor :MASLOV Eugeny, KOVALTCHUK Alexey +##################################################################### + +import geompy +import salome +import os +import math + +#Sketcher_1 creation +Sketcher_1 = geompy.MakeSketcher("Sketcher:F 100 -57.7:TT 100 57.7:TT 0 115.47:TT -100 57.7:TT -100 -57.7:TT 0 -115.47:WW") +geompy.addToStudy(Sketcher_1, "Sketcher_1") +Face_1 = geompy.MakeFace(Sketcher_1, 1) +geompy.addToStudy(Face_1, "Face_1") + +#Line creation +Line_1 = geompy.MakeLineTwoPnt(geompy.MakeVertex(0,0,0), geompy.MakeVertex(0,0,100)) +geompy.addToStudy(Line_1, "Line_1") + +#Prism creation +Prism_1 = geompy.MakePrismVecH(Face_1, Line_1, 100) +geompy.addToStudy(Prism_1, "Prism_1") + +#Sketcher_2 creation +Sketcher_2 = geompy.MakeSketcher("Sketcher:F 50 0:TT 80 0:TT 112 13:TT 112 48:TT 80 63:TT 80 90:TT 50 90:WW", [0,0,0, 1,0,0, 0,1,0]) +geompy.addToStudy(Sketcher_2, "Sketcher_2") +Face_2 = geompy.MakeFace(Sketcher_2, 1) +geompy.addToStudy(Face_2, "Face_2") + +#Revolution creation +Revolution_1 = geompy.MakeRevolution(Face_2, Line_1, 2*math.pi) +geompy.addToStudy(Revolution_1, "Revolution_1") + +#Common applying +Common_1 = geompy.MakeBoolean(Revolution_1, Prism_1, 1) +geompy.addToStudy(Common_1, "Common_1") + +#Explode Common_1 on edges +CommonExplodedListEdges = geompy.SubShapeAll(Common_1, geompy.ShapeType["EDGE"]) +for i in range(0, len(CommonExplodedListEdges)): + name = "Edge_"+str(i+1) + geompy.addToStudyInFather(Common_1, CommonExplodedListEdges[i], name) + +#Fillet applying +#ID = geompy.GetSubShapeID(Common_1, CommonExplodedListEdges[0]) +Fillet_1 = geompy.MakeFillet(Common_1, 10, geompy.ShapeType["EDGE"], [6]) +geompy.addToStudy(Fillet_1, "Fillet_1") + +#Chamfer applying +Chamfer_1 = geompy.MakeChamferEdge(Fillet_1, 10, 10, 16, 50 ) +geompy.addToStudy(Chamfer_1, "Chamfer_1") + +Chamfer_2 = geompy.MakeChamferEdge(Chamfer_1, 10, 10, 21, 31 ) +geompy.addToStudy(Chamfer_2, "Chamfer_2") + +#Import of the shape from "slots.brep" +thePath = os.getenv("DATA_DIR") +theFileName = thePath + "/Shapes/Brep/slots.brep" +theShapeForCut = geompy.ImportBREP(theFileName) +geompy.addToStudy(theShapeForCut, "slot.brep_1") + +#Cut applying +Cut_1 = geompy.MakeBoolean(Chamfer_2, theShapeForCut, 2) +geompy.addToStudy(Cut_1, "Cut_1") + +salome.sg.updateObjBrowser(1) + diff --git a/src/GEOM_SWIG/GEOM_Partition1.py b/src/GEOM_SWIG/GEOM_Partition1.py index 3a6118833..556342a84 100755 --- a/src/GEOM_SWIG/GEOM_Partition1.py +++ b/src/GEOM_SWIG/GEOM_Partition1.py @@ -1,8 +1,23 @@ -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# Copyright (C) 2005 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. # -# Copyright (C) 2003 CEA/DEN, EDF R&D +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# GEOM GEOM_SWIG : binding of C++ omplementaion with Python # # File : GEOM_Partition1.py # Module : GEOM diff --git a/src/GEOM_SWIG/GEOM_Partition2.py b/src/GEOM_SWIG/GEOM_Partition2.py index 2a4ca4e73..fd66fa72c 100755 --- a/src/GEOM_SWIG/GEOM_Partition2.py +++ b/src/GEOM_SWIG/GEOM_Partition2.py @@ -1,8 +1,23 @@ -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# Copyright (C) 2005 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. # -# Copyright (C) 2003 CEA/DEN, EDF R&D +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# GEOM GEOM_SWIG : binding of C++ omplementaion with Python # # File : GEOM_Partition2.py # Module : GEOM diff --git a/src/GEOM_SWIG/GEOM_Partition3.py b/src/GEOM_SWIG/GEOM_Partition3.py index 9f35f08b8..462c8ac7f 100755 --- a/src/GEOM_SWIG/GEOM_Partition3.py +++ b/src/GEOM_SWIG/GEOM_Partition3.py @@ -1,8 +1,23 @@ -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# Copyright (C) 2005 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. # -# Copyright (C) 2003 CEA/DEN, EDF R&D +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# GEOM GEOM_SWIG : binding of C++ omplementaion with Python # # File : GEOM_Partition3.py # Module : GEOM diff --git a/src/GEOM_SWIG/GEOM_Partition4.py b/src/GEOM_SWIG/GEOM_Partition4.py index 96dd0d4f8..348d6b45b 100755 --- a/src/GEOM_SWIG/GEOM_Partition4.py +++ b/src/GEOM_SWIG/GEOM_Partition4.py @@ -1,8 +1,23 @@ -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# Copyright (C) 2005 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. # -# Copyright (C) 2003 CEA/DEN, EDF R&D +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# GEOM GEOM_SWIG : binding of C++ omplementaion with Python # # File : GEOM_Partition4.py # Module : GEOM diff --git a/src/GEOM_SWIG/GEOM_Partition5.py b/src/GEOM_SWIG/GEOM_Partition5.py index ca6d5de81..00ce525d5 100755 --- a/src/GEOM_SWIG/GEOM_Partition5.py +++ b/src/GEOM_SWIG/GEOM_Partition5.py @@ -1,8 +1,23 @@ -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# Copyright (C) 2005 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. # -# Copyright (C) 2003 CEA/DEN, EDF R&D +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# GEOM GEOM_SWIG : binding of C++ omplementaion with Python # # File : GEOM_Partition5.py # Module : GEOM diff --git a/src/GEOM_SWIG/GEOM_Sketcher.py b/src/GEOM_SWIG/GEOM_Sketcher.py index fbdb7fbf5..dc8bf692d 100644 --- a/src/GEOM_SWIG/GEOM_Sketcher.py +++ b/src/GEOM_SWIG/GEOM_Sketcher.py @@ -1,58 +1,58 @@ -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python -# -# 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_Sketcher.py -# Author : Damien COQUERET, Open CASCADE -# Module : GEOM -# $Header$ - -import geompy - -#SKETCHER INFOS -#Init Sketcher -#Create a string beginning by :"Sketcher:" -#Each command must be separated by ":" -#"F x y" : Create first point at X & Y - -#To Make Segment -#"R angle" : Set the direction by angle -#"D dx dy" : Set the direction by DX & DY - -#"TT x y" : Create by point at X & Y -#"T dx dy" : Create by point with DX & DY -#"L length" : Create by direction & Length -#"IX x" : Create by direction & Intersect. X -#"IY y" : Create by direction & Intersect. Y - -#To Make Arc -#"C radius length" : Create by direction, radius and length(in degree) - -#To finish -#"WW" : Close Wire - -#Create Sketcher -Cmd = "Sketch:F 0 0:TT 0 100:C 100 180:WW" -Sketcher = geompy.MakeSketcher(Cmd) #(string)->GEOM_Shape_ptr - -#Add In Study -id_Sketcher = geompy.addToStudy(Sketcher, "Sketcher") +# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : GEOM_Sketcher.py +# Author : Damien COQUERET, Open CASCADE +# Module : GEOM +# $Header$ + +import geompy + +#SKETCHER INFOS +#Init Sketcher +#Create a string beginning by :"Sketcher:" +#Each command must be separated by ":" +#"F x y" : Create first point at X & Y + +#To Make Segment +#"R angle" : Set the direction by angle +#"D dx dy" : Set the direction by DX & DY + +#"TT x y" : Create by point at X & Y +#"T dx dy" : Create by point with DX & DY +#"L length" : Create by direction & Length +#"IX x" : Create by direction & Intersect. X +#"IY y" : Create by direction & Intersect. Y + +#To Make Arc +#"C radius length" : Create by direction, radius and length(in degree) + +#To finish +#"WW" : Close Wire + +#Create Sketcher +Cmd = "Sketch:F 0 0:TT 0 100:C 100 180:WW" +Sketcher = geompy.MakeSketcher(Cmd) #(string)->GEOM_Shape_ptr + +#Add In Study +id_Sketcher = geompy.addToStudy(Sketcher, "Sketcher") diff --git a/src/GEOM_SWIG/GEOM_Spanner.py b/src/GEOM_SWIG/GEOM_Spanner.py index b3d58b399..65ad23536 100644 --- a/src/GEOM_SWIG/GEOM_Spanner.py +++ b/src/GEOM_SWIG/GEOM_Spanner.py @@ -16,7 +16,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/GEOM_SWIG/GEOM_TestAll.py b/src/GEOM_SWIG/GEOM_TestAll.py index 67e626578..236e187b3 100644 --- a/src/GEOM_SWIG/GEOM_TestAll.py +++ b/src/GEOM_SWIG/GEOM_TestAll.py @@ -16,7 +16,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # File : GEOM_usinggeom.py diff --git a/src/GEOM_SWIG/GEOM_TestHealing.py b/src/GEOM_SWIG/GEOM_TestHealing.py index 4ad4a1ca3..1ae6078c9 100644 --- a/src/GEOM_SWIG/GEOM_TestHealing.py +++ b/src/GEOM_SWIG/GEOM_TestHealing.py @@ -16,7 +16,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # File : GEOM_TestHealing.py diff --git a/src/GEOM_SWIG/GEOM_TestMeasures.py b/src/GEOM_SWIG/GEOM_TestMeasures.py index 53604ea18..fe10c1dad 100644 --- a/src/GEOM_SWIG/GEOM_TestMeasures.py +++ b/src/GEOM_SWIG/GEOM_TestMeasures.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# def TestMeasureOperations (geompy, math): p0 = geompy.MakeVertex(0 , 0, 0) diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index 4389fbd14..dff28b812 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -16,7 +16,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # File : GEOM_TestOthers.py @@ -242,15 +242,19 @@ def TestOtherOperations (geompy, math): geompy.AddObject(CreateGroup, f_ind_6) # box_faces[5] geompy.AddObject(CreateGroup, f_ind_1) # box_faces[0] geompy.AddObject(CreateGroup, f_ind_4) # box_faces[3] + # Now contains f_ind_6, f_ind_1, f_ind_4 # UnionList geompy.UnionList(CreateGroup, [box_faces[2], box_faces[4], box_faces[5]]) + # Now contains f_ind_6, f_ind_1, f_ind_4, f_ind_3, f_ind_5 # RemoveObject(theGroup, theSubShapeID) geompy.RemoveObject(CreateGroup, f_ind_1) # box_faces[0] + # Now contains f_ind_6, f_ind_4, f_ind_3, f_ind_5 # DifferenceList geompy.DifferenceList(CreateGroup, [box_faces[1], box_faces[0], box_faces[3]]) + # Now contains f_ind_6, f_ind_3, f_ind_5 # GetObjectIDs GetObjectIDs = geompy.GetObjectIDs(CreateGroup) @@ -262,6 +266,21 @@ def TestOtherOperations (geompy, math): BoxCopy = geompy.GetMainShape(CreateGroup) + # DifferenceIDs + geompy.DifferenceIDs(CreateGroup, [f_ind_3, f_ind_5]) + # Now contains f_ind_6 + + # UnionIDs + geompy.UnionIDs(CreateGroup, [f_ind_1, f_ind_2, f_ind_6]) + # Now contains f_ind_6, f_ind_1, f_ind_2 + + # Check + GetObjectIDs = geompy.GetObjectIDs(CreateGroup) + print "Group of Box's faces includes the following IDs:" + print "(must be ", f_ind_6, ", ", f_ind_1, " and ", f_ind_2, ")" + for ObjectID in GetObjectIDs: + print " ", ObjectID + # ----------------------------------------------------------------------------- # enumeration ShapeTypeString as a dictionary # ----------------------------------------------------------------------------- @@ -392,12 +411,26 @@ def TestOtherOperations (geompy, math): for face_i in faces_on_pln: geompy.addToStudy(face_i, "Face on Plane (N = (0, 1, 1)) or below it") + # GetShapesOnPlaneIDs + faces_above_pln_ids = geompy.GetShapesOnPlaneIDs(blocksComp, geompy.ShapeType["FACE"], + v_0pp, geompy.GEOM.ST_OUT) + faces_above = geompy.CreateGroup(blocksComp, geompy.ShapeType["FACE"]) + geompy.UnionIDs(faces_above, faces_above_pln_ids) + geompy.addToStudy(faces_above, "Group of faces above Plane (N = (0, 1, 1))") + # GetShapesOnCylinder - edges_on_cyl = geompy.GetShapesOnCylinder(blocksComp, geompy.ShapeType["EDGE"], - vy, 55, geompy.GEOM.ST_OUT) - for edge_i in edges_on_cyl: + edges_out_cyl = geompy.GetShapesOnCylinder(blocksComp, geompy.ShapeType["EDGE"], + vy, 55, geompy.GEOM.ST_OUT) + for edge_i in edges_out_cyl: geompy.addToStudy(edge_i, "Edge out of Cylinder (axis = (0, 1, 0), r = 55)") + # GetShapesOnCylinderIDs + edges_in_cyl_ids = geompy.GetShapesOnCylinderIDs(blocksComp, geompy.ShapeType["EDGE"], + vy, 80, geompy.GEOM.ST_IN) + edges_in = geompy.CreateGroup(blocksComp, geompy.ShapeType["EDGE"]) + geompy.UnionIDs(edges_in, edges_in_cyl_ids) + geompy.addToStudy(edges_in, "Group of edges inside Cylinder (axis = (0, 1, 0), r = 55)") + # GetShapesOnSphere vertices_on_sph = geompy.GetShapesOnSphere(blocksComp, geompy.ShapeType["VERTEX"], p0, 100, geompy.GEOM.ST_ON) @@ -405,6 +438,13 @@ def TestOtherOperations (geompy, math): geompy.addToStudy(vertex_i, "Vertex on Sphere (center = (0, 0, 0), r = 100)") pass + # GetShapesOnSphereIDs + vertices_on_sph_ids = geompy.GetShapesOnSphereIDs(blocksComp, geompy.ShapeType["VERTEX"], + p0, 100, geompy.GEOM.ST_ON) + vertices_on = geompy.CreateGroup(blocksComp, geompy.ShapeType["VERTEX"]) + geompy.UnionIDs(vertices_on, vertices_on_sph_ids) + geompy.addToStudy(vertices_on, "Group of vertices on Sphere (center = (0, 0, 0), r = 100)") + # GetShapesOnQuadrangle geompy.addToStudy(f12, "F12" ) @@ -428,6 +468,13 @@ def TestOtherOperations (geompy, math): print "Error in GetShapesOnQuadrangle()" pass + # GetShapesOnQuadrangleIDs + vertices_on_quad_ids = geompy.GetShapesOnQuadrangleIDs(f12, geompy.ShapeType["VERTEX"], + tl, tr, bl, br, geompy.GEOM.ST_ON) + vertices_on_quad = geompy.CreateGroup(f12, geompy.ShapeType["VERTEX"]) + geompy.UnionIDs(vertices_on_quad, vertices_on_quad_ids) + geompy.addToStudy(vertices_on_quad, "Group of vertices on Quadrangle F12") + # GetInPlace(theShapeWhere, theShapeWhat) box5 = geompy.MakeBoxDXDYDZ(100, 100, 100) box6 = geompy.MakeTranslation(box5, 50, 50, 0) diff --git a/src/GEOM_SWIG/GEOM_blocks.py b/src/GEOM_SWIG/GEOM_blocks.py index fca4d3fb6..109556e3a 100644 --- a/src/GEOM_SWIG/GEOM_blocks.py +++ b/src/GEOM_SWIG/GEOM_blocks.py @@ -16,7 +16,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/GEOM_SWIG/GEOM_cyl2complementary.py b/src/GEOM_SWIG/GEOM_cyl2complementary.py index 97efc776e..1190037ab 100755 --- a/src/GEOM_SWIG/GEOM_cyl2complementary.py +++ b/src/GEOM_SWIG/GEOM_cyl2complementary.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# #============================================================================== # Info. # Bug (from script, bug) : cyl2complementary_modified.py, PAL6700 @@ -12,11 +31,12 @@ import salome import geompy geomgui = salome.ImportComponentGUI("GEOM") - +import salome_ComponentGUI def addToStudy(shape, name): i = geompy.addToStudy(shape, name) salome.sg.updateObjBrowser(0) - geomgui.createAndDisplayGO(i) + if not isinstance(geomgui, type(salome_ComponentGUI)): + geomgui.createAndDisplayGO(i) return i # Piece diff --git a/src/GEOM_SWIG/GEOM_example.py b/src/GEOM_SWIG/GEOM_example.py index 6feb7b453..121419496 100644 --- a/src/GEOM_SWIG/GEOM_example.py +++ b/src/GEOM_SWIG/GEOM_example.py @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/GEOM_SWIG/GEOM_example2.py b/src/GEOM_SWIG/GEOM_example2.py index 87ae39ddc..5b57a7078 100644 --- a/src/GEOM_SWIG/GEOM_example2.py +++ b/src/GEOM_SWIG/GEOM_example2.py @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/GEOM_SWIG/GEOM_example3.py b/src/GEOM_SWIG/GEOM_example3.py index 1287f6853..4e0dbd1bc 100644 --- a/src/GEOM_SWIG/GEOM_example3.py +++ b/src/GEOM_SWIG/GEOM_example3.py @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -30,7 +30,7 @@ import salome import geompy import math from time import sleep - +import salome_ComponentGUI geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") myBuilder = salome.myStudy.NewBuilder() @@ -47,14 +47,16 @@ dirz = BasicOp.MakeVectorTwoPnt(point0,pointz1) torus1 = PrimOp.MakeTorusPntVecRR(point0,dirz,150.,25.) id_torus1 = geompy.addToStudy(torus1,"torus1") -gg.createAndDisplayGO(id_torus1) +if not isinstance(gg, type(salome_ComponentGUI)): + gg.createAndDisplayGO(id_torus1) torus2 = InsertOp.MakeCopy(torus1) vec1 = BasicOp.MakeVectorDXDYDZ(0.,0.,100.) torus2 = TrsfOp.TranslateVectorCopy(torus2,vec1) id_torus2 = geompy.addToStudy(torus2,"torus2") -gg.createAndDisplayGO(id_torus2) +if not isinstance(gg, type(salome_ComponentGUI)): + gg.createAndDisplayGO(id_torus2) cylz1 = PrimOp.MakeCylinderPntVecRH(point0,dirz,25.,100.) @@ -70,7 +72,8 @@ while ind < 6: name = "cyl%d"%(ind) acyl = TrsfOp.TranslateVectorCopy(acyl,vec_i) id_acyl = geompy.addToStudy(acyl,name) - gg.createAndDisplayGO(id_acyl) + if not isinstance(gg, type(salome_ComponentGUI)): + gg.createAndDisplayGO(id_acyl) shapeList.append(acyl) idList.append(id_acyl) ind = ind +1 @@ -82,7 +85,8 @@ idList.append(id_torus2) cage = geompy.MakeCompound(shapeList) id_cage = geompy.addToStudy(cage,"cage") -gg.createAndDisplayGO(id_cage) +if not isinstance(gg, type(salome_ComponentGUI)): + gg.createAndDisplayGO(id_cage) from salome import sg sleep(1) @@ -102,15 +106,15 @@ for id in idList: sg.Display(id_torus1) sg.Display(id_torus2) sg.Display(id_acyl) - -gg.setTransparency(id_torus1,0.5) - -gg.setDisplayMode(id_torus1,1) -gg.setDisplayMode(id_torus2,1) -gg.setDisplayMode(id_acyl,1) -#gg.setDisplayMode(id_cage,1) - -gg.setColor(id_torus1,0,0,255) -gg.setColor(id_torus2,255,0,0) -gg.setColor(id_acyl,0,255,0) -#gg.setColor(id_cage,255,255,0) +if not isinstance(gg, type(salome_ComponentGUI)): + gg.setTransparency(id_torus1,0.5) + + gg.setDisplayMode(id_torus1,1) + gg.setDisplayMode(id_torus2,1) + gg.setDisplayMode(id_acyl,1) + #gg.setDisplayMode(id_cage,1) + + gg.setColor(id_torus1,0,0,255) + gg.setColor(id_torus2,255,0,0) + gg.setColor(id_acyl,0,255,0) + #gg.setColor(id_cage,255,255,0) diff --git a/src/GEOM_SWIG/GEOM_example4.py b/src/GEOM_SWIG/GEOM_example4.py index 631ef13ca..cc8d82941 100755 --- a/src/GEOM_SWIG/GEOM_example4.py +++ b/src/GEOM_SWIG/GEOM_example4.py @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -34,7 +34,7 @@ import geompy geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") myBuilder = salome.myStudy.NewBuilder() -from geompy import gg +#from geompy import gg #smeshgui = salome.ImportComponentGUI("SMESH") #smeshgui.Init(salome.myStudyId); diff --git a/src/GEOM_SWIG/GEOM_example5.py b/src/GEOM_SWIG/GEOM_example5.py index c26239ba4..035d9a956 100644 --- a/src/GEOM_SWIG/GEOM_example5.py +++ b/src/GEOM_SWIG/GEOM_example5.py @@ -1,54 +1,54 @@ -# GEOM GEOM_SWIG : binding of C++ omplementaion with Python -# -# 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_example5.py -# Author : Damien COQUERET, Open CASCADE -# Module : GEOM -# $Header$ - -import salome -import geompy - -geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") - -#Create Points -BasicOp = geom.GetIBasicOperations(salome.myStudyId) -Vertex1 = BasicOp.MakePointXYZ(0., 0., 0.) -Vertex2 = BasicOp.MakePointXYZ(100., 20., 30.) -Vertex3 = BasicOp.MakePointXYZ(150., 100., -25.) -Vertex4 = BasicOp.MakePointXYZ(40., -80., 79.) - -#GEOM_Objects List for Splines -GOList = [] -GOList.append(Vertex1) -GOList.append(Vertex2) -GOList.append(Vertex3) -GOList.append(Vertex4) - -#Create Splines -Bezier = geompy.MakeBezier(GOList) -Interpol = geompy.MakeInterpol(GOList) - -#Add In Study -id_Bezier = geompy.addToStudy(Bezier, "Bezier") -id_Interpol = geompy.addToStudy(Interpol, "Interpol") +# GEOM GEOM_SWIG : binding of C++ omplementaion with Python +# +# 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# +# +# File : GEOM_example5.py +# Author : Damien COQUERET, Open CASCADE +# Module : GEOM +# $Header$ + +import salome +import geompy + +geom = salome.lcc.FindOrLoadComponent("FactoryServer", "GEOM") + +#Create Points +BasicOp = geom.GetIBasicOperations(salome.myStudyId) +Vertex1 = BasicOp.MakePointXYZ(0., 0., 0.) +Vertex2 = BasicOp.MakePointXYZ(100., 20., 30.) +Vertex3 = BasicOp.MakePointXYZ(150., 100., -25.) +Vertex4 = BasicOp.MakePointXYZ(40., -80., 79.) + +#GEOM_Objects List for Splines +GOList = [] +GOList.append(Vertex1) +GOList.append(Vertex2) +GOList.append(Vertex3) +GOList.append(Vertex4) + +#Create Splines +Bezier = geompy.MakeBezier(GOList) +Interpol = geompy.MakeInterpol(GOList) + +#Add In Study +id_Bezier = geompy.addToStudy(Bezier, "Bezier") +id_Interpol = geompy.addToStudy(Interpol, "Interpol") diff --git a/src/GEOM_SWIG/GEOM_moteur.py b/src/GEOM_SWIG/GEOM_moteur.py index dfe87ae27..23ad1aeda 100644 --- a/src/GEOM_SWIG/GEOM_moteur.py +++ b/src/GEOM_SWIG/GEOM_moteur.py @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/GEOM_SWIG/GEOM_shared_modules.py b/src/GEOM_SWIG/GEOM_shared_modules.py index bd994fadc..67f962a2f 100644 --- a/src/GEOM_SWIG/GEOM_shared_modules.py +++ b/src/GEOM_SWIG/GEOM_shared_modules.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# """ """ diff --git a/src/GEOM_SWIG/GEOM_shellSolid.py b/src/GEOM_SWIG/GEOM_shellSolid.py index 0495979c1..b3c1daffd 100755 --- a/src/GEOM_SWIG/GEOM_shellSolid.py +++ b/src/GEOM_SWIG/GEOM_shellSolid.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# #============================================================================== # Info. # Bug (from script, bug) : shellSolid_modified.py, PAL6611 diff --git a/src/GEOM_SWIG/GEOM_tube_geom.py b/src/GEOM_SWIG/GEOM_tube_geom.py index b91935223..c3034ffaf 100755 --- a/src/GEOM_SWIG/GEOM_tube_geom.py +++ b/src/GEOM_SWIG/GEOM_tube_geom.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# #============================================================================== # Info. # Bug (from script, bug) : tube_geom_corrected.py, PAL5243 diff --git a/src/GEOM_SWIG/GEOM_tube_geom_gg2.py b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py index 29f77815f..9c1f2ce01 100755 --- a/src/GEOM_SWIG/GEOM_tube_geom_gg2.py +++ b/src/GEOM_SWIG/GEOM_tube_geom_gg2.py @@ -1,157 +1,179 @@ -#============================================================================== -# Info. -# Bug (from script, bug) : tube_geom_gg2_corrected.py, PAL5243 -# Modified : 25/11/2004 -# Author : Kovaltchuk Alexey -# Project : PAL/SALOME -#============================================================================== -# -# Geometrie du cas test -# - -from geompy import * -import salome -# -# base de l'assemblage -# -L_base = 300. -l_base = 150. -h_base = 75. -e_base = 6. - -base_bot = MakeBox(0.,0.,0.,L_base,l_base,e_base) -base_top = MakeTranslation(base_bot,0.,0.,h_base-e_base) -base_front = MakeBox(0,0,0,L_base,e_base,h_base) -base_rear = MakeTranslation(base_front,0.,l_base,0.) - -tmp = MakeBoolean(base_top,base_rear,3) -tmp = MakeBoolean(tmp,base_bot,3) -base = MakeBoolean(tmp,base_front,3) - -baseId = addToStudy(base,"base") -# -# traverse -# -L_trav = 60. -h_trav = 300. -e_trav = 7. -marge = 15. - -flange_left = MakeBox(0.,0.,0,e_trav,L_trav,h_trav) -flange_right = MakeTranslation(flange_left,L_trav-e_trav,0.,0.) -flange_front = MakeBox(0.,0.,0,L_trav,e_trav,h_trav) -flange_rear = MakeTranslation(flange_front,0.,L_trav-e_trav,0.) - -tmp = MakeBoolean(flange_left,flange_rear,3) -tmp = MakeBoolean(tmp,flange_right,3) -flange = MakeBoolean(tmp,flange_front,3) -# -# left chamfer -# -import math -length = e_trav/math.sin(math.pi/4.) -yaxis = MakeVectorDXDYDZ(0.,1.,0.) -cut_left = MakeBox(0.,-marge,0.,-length,L_trav+marge,length) -cut_left = MakeRotation(cut_left,yaxis,-math.pi/4.) -cut_left = MakeTranslation(cut_left,e_trav,0.,0.) -# -# right chamfer -# -symPlaneYZ = MakePlane( - MakeVertex(L_trav/2.,0.,0.), - MakeVectorDXDYDZ(1.,0.,0.), 10000. ) -cut_right = MakeMirrorByPlane(cut_left,symPlaneYZ) -# -# front chamfer -# -xaxis = MakeVectorDXDYDZ(1.,0.,0.) -cut_front = MakeBox(-marge,0.,0.,L_trav+marge,length,length) -cut_front = MakeRotation(cut_front,xaxis,3.*math.pi/4.) -cut_front = MakeTranslation(cut_front,0.,e_trav,0.) -# -# rear chamfer -# -symPlaneXZ = MakePlane( - MakeVertex(0.,L_trav/2.,0.), - MakeVectorDXDYDZ(0.,1.,0.), 10000. ) -cut_rear = MakeMirrorByPlane(cut_front,symPlaneXZ) -# -# chamfer -# -trav = MakeBoolean(flange,cut_left,2) -trav = MakeBoolean(trav,cut_right,2) -trav = MakeBoolean(trav,cut_front,2) -trav = MakeBoolean(trav,cut_rear,2) -trav = MakeTranslation(trav, - L_base/2.-L_trav/2., - l_base/2.-L_trav/2., - h_base) -travId = addToStudy(trav,"trav") -# -# Welding -# -ground = MakeBox(-1000.,-1000.,0.,1000.,1000.,-1000.) -weld_left = MakeBoolean(cut_left,ground,2) -weld_right = MakeBoolean(cut_right,ground,2) -weld_front = MakeBoolean(cut_front,ground,2) -weld_rear = MakeBoolean(cut_rear,ground,2) -# -# Assembly -# -coarse_weld = MakeBoolean(weld_left,weld_rear,3) -coarse_weld = MakeBoolean(coarse_weld,weld_right,3) -coarse_weld = MakeBoolean(coarse_weld,weld_front,3) -# -# Cleaners -# -left_cleaner = MakeBox(0.,-10*marge,0.,-10.*marge,10.*marge,10.*marge) -left_cleaner = MakeRotation(left_cleaner,yaxis,math.pi/4.) -left_cleaner = MakeTranslation(left_cleaner,-e_trav-2.*marge,0.,-2.*marge) - -right_cleaner = MakeMirrorByPlane(left_cleaner,symPlaneYZ) - -front_cleaner = MakeBox(-10*marge,0.,0.,10.*marge,10.*marge,10.*marge) -front_cleaner = MakeRotation(front_cleaner,xaxis,3.*math.pi/4.) -front_cleaner = MakeTranslation(front_cleaner,0.,2.*marge-e_trav,2.*marge) - -rear_cleaner = MakeMirrorByPlane(front_cleaner,symPlaneXZ) -# -# Welding -# -weld = MakeBoolean(coarse_weld,left_cleaner,2) -weld = MakeBoolean(weld,rear_cleaner,2) -weld = MakeBoolean(weld,right_cleaner,2) -weld = MakeBoolean(weld,front_cleaner,2) -weld = MakeTranslation(weld, - L_base/2.-L_trav/2., - l_base/2.-L_trav/2., - h_base) -weldId = addToStudy(weld,"weld") -# -# Assembly -# -#assemblage = MakePartition([base.,weld.GetName()]) -assemblage = MakePartition([base,weld]) -addToStudy(assemblage, "base+weld") -#print assemblage.GetName() -#print trav.GetName() -#assemblage = MakePartition([assemblage.GetName(),trav.GetName()]) -assemblage = MakePartition([assemblage,trav]) -assemblageId = addToStudy(assemblage, "assemblage") - -# -# Display -# -gg.createAndDisplayGO(baseId) -gg.setTransparency(baseId,0.5) -gg.setDisplayMode(baseId,1) -gg.setColor(baseId,255,0,0) -gg.createAndDisplayGO(travId) -gg.setTransparency(travId,0.5) -gg.setDisplayMode(travId,1) -gg.setColor(travId,255,0,0) -gg.createAndDisplayGO(weldId) -gg.setTransparency(weldId,0.5) -gg.setDisplayMode(weldId,1) -gg.setColor(weldId,0,0,255) - +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +#============================================================================== +# Info. +# Bug (from script, bug) : tube_geom_gg2_corrected.py, PAL5243 +# Modified : 25/11/2004 +# Author : Kovaltchuk Alexey +# Project : PAL/SALOME +#============================================================================== +# +# Geometrie du cas test +# + +from geompy import * +import salome +# +# base de l'assemblage +# +L_base = 300. +l_base = 150. +h_base = 75. +e_base = 6. + +base_bot = MakeBox(0.,0.,0.,L_base,l_base,e_base) +base_top = MakeTranslation(base_bot,0.,0.,h_base-e_base) +base_front = MakeBox(0,0,0,L_base,e_base,h_base) +base_rear = MakeTranslation(base_front,0.,l_base,0.) + +tmp = MakeBoolean(base_top,base_rear,3) +tmp = MakeBoolean(tmp,base_bot,3) +base = MakeBoolean(tmp,base_front,3) + +baseId = addToStudy(base,"base") +# +# traverse +# +L_trav = 60. +h_trav = 300. +e_trav = 7. +marge = 15. + +flange_left = MakeBox(0.,0.,0,e_trav,L_trav,h_trav) +flange_right = MakeTranslation(flange_left,L_trav-e_trav,0.,0.) +flange_front = MakeBox(0.,0.,0,L_trav,e_trav,h_trav) +flange_rear = MakeTranslation(flange_front,0.,L_trav-e_trav,0.) + +tmp = MakeBoolean(flange_left,flange_rear,3) +tmp = MakeBoolean(tmp,flange_right,3) +flange = MakeBoolean(tmp,flange_front,3) +# +# left chamfer +# +import math +length = e_trav/math.sin(math.pi/4.) +yaxis = MakeVectorDXDYDZ(0.,1.,0.) +cut_left = MakeBox(0.,-marge,0.,-length,L_trav+marge,length) +cut_left = MakeRotation(cut_left,yaxis,-math.pi/4.) +cut_left = MakeTranslation(cut_left,e_trav,0.,0.) +# +# right chamfer +# +symPlaneYZ = MakePlane( + MakeVertex(L_trav/2.,0.,0.), + MakeVectorDXDYDZ(1.,0.,0.), 10000. ) +cut_right = MakeMirrorByPlane(cut_left,symPlaneYZ) +# +# front chamfer +# +xaxis = MakeVectorDXDYDZ(1.,0.,0.) +cut_front = MakeBox(-marge,0.,0.,L_trav+marge,length,length) +cut_front = MakeRotation(cut_front,xaxis,3.*math.pi/4.) +cut_front = MakeTranslation(cut_front,0.,e_trav,0.) +# +# rear chamfer +# +symPlaneXZ = MakePlane( + MakeVertex(0.,L_trav/2.,0.), + MakeVectorDXDYDZ(0.,1.,0.), 10000. ) +cut_rear = MakeMirrorByPlane(cut_front,symPlaneXZ) +# +# chamfer +# +trav = MakeBoolean(flange,cut_left,2) +trav = MakeBoolean(trav,cut_right,2) +trav = MakeBoolean(trav,cut_front,2) +trav = MakeBoolean(trav,cut_rear,2) +trav = MakeTranslation(trav, + L_base/2.-L_trav/2., + l_base/2.-L_trav/2., + h_base) +travId = addToStudy(trav,"trav") +# +# Welding +# +ground = MakeBox(-1000.,-1000.,0.,1000.,1000.,-1000.) +weld_left = MakeBoolean(cut_left,ground,2) +weld_right = MakeBoolean(cut_right,ground,2) +weld_front = MakeBoolean(cut_front,ground,2) +weld_rear = MakeBoolean(cut_rear,ground,2) +# +# Assembly +# +coarse_weld = MakeBoolean(weld_left,weld_rear,3) +coarse_weld = MakeBoolean(coarse_weld,weld_right,3) +coarse_weld = MakeBoolean(coarse_weld,weld_front,3) +# +# Cleaners +# +left_cleaner = MakeBox(0.,-10*marge,0.,-10.*marge,10.*marge,10.*marge) +left_cleaner = MakeRotation(left_cleaner,yaxis,math.pi/4.) +left_cleaner = MakeTranslation(left_cleaner,-e_trav-2.*marge,0.,-2.*marge) + +right_cleaner = MakeMirrorByPlane(left_cleaner,symPlaneYZ) + +front_cleaner = MakeBox(-10*marge,0.,0.,10.*marge,10.*marge,10.*marge) +front_cleaner = MakeRotation(front_cleaner,xaxis,3.*math.pi/4.) +front_cleaner = MakeTranslation(front_cleaner,0.,2.*marge-e_trav,2.*marge) + +rear_cleaner = MakeMirrorByPlane(front_cleaner,symPlaneXZ) +# +# Welding +# +weld = MakeBoolean(coarse_weld,left_cleaner,2) +weld = MakeBoolean(weld,rear_cleaner,2) +weld = MakeBoolean(weld,right_cleaner,2) +weld = MakeBoolean(weld,front_cleaner,2) +weld = MakeTranslation(weld, + L_base/2.-L_trav/2., + l_base/2.-L_trav/2., + h_base) +weldId = addToStudy(weld,"weld") +# +# Assembly +# +#assemblage = MakePartition([base.,weld.GetName()]) +assemblage = MakePartition([base,weld]) +addToStudy(assemblage, "base+weld") +#print assemblage.GetName() +#print trav.GetName() +#assemblage = MakePartition([assemblage.GetName(),trav.GetName()]) +assemblage = MakePartition([assemblage,trav]) +assemblageId = addToStudy(assemblage, "assemblage") + +# +# Display +# +gg = ImportComponentGUI("GEOM") +import salome_ComponentGUI +if not isinstance(gg, type(salome_ComponentGUI)): + gg.initGeomGen() + gg.createAndDisplayGO(baseId) + gg.setTransparency(baseId,0.5) + gg.setDisplayMode(baseId,1) + gg.setColor(baseId,255,0,0) + gg.createAndDisplayGO(travId) + gg.setTransparency(travId,0.5) + gg.setDisplayMode(travId,1) + gg.setColor(travId,255,0,0) + gg.createAndDisplayGO(weldId) + gg.setTransparency(weldId,0.5) + gg.setDisplayMode(weldId,1) + gg.setColor(weldId,0,0,255) diff --git a/src/GEOM_SWIG/GEOM_usinggeom.py b/src/GEOM_SWIG/GEOM_usinggeom.py index 08fdc0864..b49d22d11 100644 --- a/src/GEOM_SWIG/GEOM_usinggeom.py +++ b/src/GEOM_SWIG/GEOM_usinggeom.py @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/GEOM_SWIG/Makefile.in b/src/GEOM_SWIG/Makefile.in index 8f3d5c12a..9c593fc92 100644 --- a/src/GEOM_SWIG/Makefile.in +++ b/src/GEOM_SWIG/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py index 68d54f14f..46b7ecabf 100755 --- a/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_019_020_geometry.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# ##################################################################################### #Created :17/02/2005 #Auhtor :KOVALTCHUK Alexey diff --git a/src/GEOM_SWIG/PAL_MESH_028_geometry.py b/src/GEOM_SWIG/PAL_MESH_028_geometry.py index cd4aa6cf4..6063695c3 100755 --- a/src/GEOM_SWIG/PAL_MESH_028_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_028_geometry.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# ##################################################################### #Created :17/02/2005 #Auhtor :KOVALTCHUK Alexey diff --git a/src/GEOM_SWIG/PAL_MESH_030_geometry.py b/src/GEOM_SWIG/PAL_MESH_030_geometry.py index 374cbf922..de0c447fe 100755 --- a/src/GEOM_SWIG/PAL_MESH_030_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_030_geometry.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# #============================================================================== # Created : 17/02/2005 # Author : Alexander KOVALEV diff --git a/src/GEOM_SWIG/PAL_MESH_033_geometry.py b/src/GEOM_SWIG/PAL_MESH_033_geometry.py index 0040b33ca..e4c4e3541 100755 --- a/src/GEOM_SWIG/PAL_MESH_033_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_033_geometry.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# ##################################################################### #Created :17/02/2005 #Auhtor :KOVALTCHUK Alexey diff --git a/src/GEOM_SWIG/PAL_MESH_035_geometry.py b/src/GEOM_SWIG/PAL_MESH_035_geometry.py index ef3fe52e2..d79f21c9a 100755 --- a/src/GEOM_SWIG/PAL_MESH_035_geometry.py +++ b/src/GEOM_SWIG/PAL_MESH_035_geometry.py @@ -1,3 +1,22 @@ +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# ##################################################################### #Created :15/02/2005 #Auhtor :KOVALTCHUK Alexey diff --git a/src/GEOM_SWIG/batchmode_geompy.py b/src/GEOM_SWIG/batchmode_geompy.py index aa90a337f..6d280f1f8 100644 --- a/src/GEOM_SWIG/batchmode_geompy.py +++ b/src/GEOM_SWIG/batchmode_geompy.py @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/GEOM_SWIG/geompy.py b/src/GEOM_SWIG/geompy.py index 6d47c038a..b3d72514e 100644 --- a/src/GEOM_SWIG/geompy.py +++ b/src/GEOM_SWIG/geompy.py @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -36,8 +36,8 @@ import GEOM g = lcc.FindOrLoadComponent("FactoryServer", "GEOM") geom = g._narrow( GEOM.GEOM_Gen ) -gg = ImportComponentGUI("GEOM") -gg.initGeomGen() +#gg = ImportComponentGUI("GEOM") +#gg.initGeomGen() #SRN: modified on Mar 18, 2005 @@ -100,24 +100,22 @@ init_geom(myStudy) #SRN: end of modifications +## Get name for sub-shape aSubObj of shape aMainObj +# +# Example: see GEOM_TestAll.py def SubShapeName(aSubObj, aMainObj): - """ - * Get name for sub-shape aSubObj of shape aMainObj - - * Example: see GEOM_TestAll.py - """ - aSubId = orb.object_to_string(aSubObj) - aMainId = orb.object_to_string(aMainObj) - index = gg.getIndexTopology(aSubId, aMainId) - name = gg.getShapeTypeString(aSubId) + "_%d"%(index) + #aSubId = orb.object_to_string(aSubObj) + #aMainId = orb.object_to_string(aMainObj) + #index = gg.getIndexTopology(aSubId, aMainId) + #name = gg.getShapeTypeString(aSubId) + "_%d"%(index) + index = ShapesOp.GetTopologyIndex(aMainObj, aSubObj) + name = ShapesOp.GetShapeTypeString(aSubObj) + "_%d"%(index) return name +## Publish in study aShape with name aName +# +# Example: see GEOM_TestAll.py def addToStudy(aShape, aName): - """ - * Publish in study aShape with name aName - - * Example: see GEOM_TestAll.py - """ try: aSObject = geom.AddInStudy(myStudy, aShape, aName, None) except: @@ -125,12 +123,10 @@ def addToStudy(aShape, aName): return "" return aShape.GetStudyEntry() +## Publish in study aShape with name aName as sub-object of previously published aFather +# +# Example: see GEOM_TestAll.py def addToStudyInFather(aFather, aShape, aName): - """ - * Publish in study aShape with name aName as sub-object of previously published aFather - - * Example: see GEOM_TestAll.py - """ try: aSObject = geom.AddInStudy(myStudy, aShape, aName, aFather) except: @@ -148,179 +144,165 @@ ShapeType = {"COMPOUND":0, "COMPSOLID":1, "SOLID":2, "SHELL":3, "FACE":4, "WIRE" # Basic primitives # ----------------------------------------------------------------------------- +## Create point by three coordinates. +# @param theX The X coordinate of the point. +# @param theY The Y coordinate of the point. +# @param theZ The Z coordinate of the point. +# @return New GEOM_Object, containing the created point. +# +# Example: see GEOM_TestAll.py def MakeVertex(theX, theY, theZ): - """ - * Create point by three coordinates. - * \param theX The X coordinate of the point. - * \param theY The Y coordinate of the point. - * \param theZ The Z coordinate of the point. - * \return New GEOM_Object, containing the created point. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakePointXYZ(theX, theY, theZ) if BasicOp.IsDone() == 0: print "MakePointXYZ : ", BasicOp.GetErrorCode() return anObj +## Create a point, distant from the referenced point +# on the given distances along the coordinate axes. +# @param theReference The referenced point. +# @param theX Displacement from the referenced point along OX axis. +# @param theY Displacement from the referenced point along OY axis. +# @param theZ Displacement from the referenced point along OZ axis. +# @return New GEOM_Object, containing the created point. +# +# Example: see GEOM_TestAll.py def MakeVertexWithRef(theReference, theX, theY, theZ): - """ - * Create a point, distant from the referenced point - * on the given distances along the coordinate axes. - * \param theReference The referenced point. - * \param theX Displacement from the referenced point along OX axis. - * \param theY Displacement from the referenced point along OY axis. - * \param theZ Displacement from the referenced point along OZ axis. - * \return New GEOM_Object, containing the created point. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakePointWithReference(theReference, theX, theY, theZ) if BasicOp.IsDone() == 0: print "MakePointWithReference : ", BasicOp.GetErrorCode() return anObj +## Create a point, corresponding to the given parameter on the given curve. +# @param theRefCurve The referenced curve. +# @param theParameter Value of parameter on the referenced curve. +# @return New GEOM_Object, containing the created point. +# +# Example: see GEOM_TestAll.py def MakeVertexOnCurve(theRefCurve, theParameter): - """ - * Create a point, corresponding to the given parameter on the given curve. - * \param theRefCurve The referenced curve. - * \param theParameter Value of parameter on the referenced curve. - * \return New GEOM_Object, containing the created point. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakePointOnCurve(theRefCurve, theParameter) if BasicOp.IsDone() == 0: print "MakePointOnCurve : ", BasicOp.GetErrorCode() return anObj +## Create a tangent, corresponding to the given parameter on the given curve. +# @param theRefCurve The referenced curve. +# @param theParameter Value of parameter on the referenced curve. +# @return New GEOM_Object, containing the created tangent. +def MakeTangentOnCurve(theRefCurve, theParameter): + anObj = BasicOp.MakeTangentOnCurve(theRefCurve, theParameter) + if BasicOp.IsDone() == 0: + print "MakeTangentOnCurve : ", BasicOp.GetErrorCode() + return anObj + +## Create a vector with the given components. +# @param theDX X component of the vector. +# @param theDY Y component of the vector. +# @param theDZ Z component of the vector. +# @return New GEOM_Object, containing the created vector. +# +# Example: see GEOM_TestAll.py def MakeVectorDXDYDZ(theDX, theDY, theDZ): - """ - * Create a vector with the given components. - * \param theDX X component of the vector. - * \param theDY Y component of the vector. - * \param theDZ Z component of the vector. - * \return New GEOM_Object, containing the created vector. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakeVectorDXDYDZ(theDX, theDY, theDZ) if BasicOp.IsDone() == 0: print "MakeVectorDXDYDZ : ", BasicOp.GetErrorCode() return anObj +## Create a vector between two points. +# @param thePnt1 Start point for the vector. +# @param thePnt2 End point for the vector. +# @return New GEOM_Object, containing the created vector. + +# Example: see GEOM_TestAll.py def MakeVector(thePnt1, thePnt2): - """ - * Create a vector between two points. - * \param thePnt1 Start point for the vector. - * \param thePnt2 End point for the vector. - * \return New GEOM_Object, containing the created vector. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakeVectorTwoPnt(thePnt1, thePnt2) if BasicOp.IsDone() == 0: print "MakeVectorTwoPnt : ", BasicOp.GetErrorCode() return anObj +## 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. +# +# Example: see GEOM_TestAll.py def MakeLine(thePnt, theDir): - """ - * 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. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakeLine(thePnt, theDir) if BasicOp.IsDone() == 0: print "MakeLine : ", BasicOp.GetErrorCode() return anObj +## Create a line, passing through the given points +# @param thePnt1 First of two points, defining the line. +# @param thePnt2 Second of two points, defining the line. +# @return New GEOM_Object, containing the created line. +# +# Example: see GEOM_TestAll.py def MakeLineTwoPnt(thePnt1, thePnt2): - """ - * Create a line, passing through the given points - * \param thePnt1 First of two points, defining the line. - * \param thePnt2 Second of two points, defining the line. - * \return New GEOM_Object, containing the created line. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakeLineTwoPnt(thePnt1, thePnt2) if BasicOp.IsDone() == 0: print "MakeLineTwoPnt : ", BasicOp.GetErrorCode() return anObj +## Create a plane, passing through the given point +# and normal to the given vector. +# @param thePnt Point, the plane has to pass through. +# @param theVec Vector, defining the plane normal direction. +# @param theTrimSize Half size of a side of quadrangle face, representing the plane. +# @return New GEOM_Object, containing the created plane. +# +# Example: see GEOM_TestAll.py def MakePlane(thePnt, theVec, theTrimSize): - """ - * Create a plane, passing through the given point - * and normal to the given vector. - * \param thePnt Point, the plane has to pass through. - * \param theVec Vector, defining the plane normal direction. - * \param theTrimSize Half size of a side of quadrangle face, representing the plane. - * \return New GEOM_Object, containing the created plane. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakePlanePntVec(thePnt, theVec, theTrimSize) if BasicOp.IsDone() == 0: print "MakePlanePntVec : ", BasicOp.GetErrorCode() return anObj +## Create a plane, passing through the three given points +# @param thePnt1 First of three points, defining the plane. +# @param thePnt2 Second of three points, defining the plane. +# @param thePnt3 Fird of three points, defining the plane. +# @param theTrimSize Half size of a side of quadrangle face, representing the plane. +# @return New GEOM_Object, containing the created plane. +# +# Example: see GEOM_TestAll.py def MakePlaneThreePnt(thePnt1, thePnt2, thePnt3, theTrimSize): - """ - * Create a plane, passing through the three given points - * \param thePnt1 First of three points, defining the plane. - * \param thePnt2 Second of three points, defining the plane. - * \param thePnt3 Fird of three points, defining the plane. - * \param theTrimSize Half size of a side of quadrangle face, representing the plane. - * \return New GEOM_Object, containing the created plane. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakePlaneThreePnt(thePnt1, thePnt2, thePnt3, theTrimSize) if BasicOp.IsDone() == 0: print "MakePlaneThreePnt : ", BasicOp.GetErrorCode() return anObj +## Create a plane, similar to the existing one, but with another size of representing face. +# @param theFace Referenced plane. +# @param theTrimSize New half size of a side of quadrangle face, representing the plane. +# @return New GEOM_Object, containing the created plane. +# +# Example: see GEOM_TestAll.py def MakePlaneFace(theFace, theTrimSize): - """ - * Create a plane, similar to the existing one, but with another size of representing face. - * \param theFace Referenced plane. - * \param theTrimSize New half size of a side of quadrangle face, representing the plane. - * \return New GEOM_Object, containing the created plane. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakePlaneFace(theFace, theTrimSize) if BasicOp.IsDone() == 0: print "MakePlaneFace : ", BasicOp.GetErrorCode() return anObj +## Create a local coordinate system. +# @param OX,OY,OZ Three coordinates of coordinate system origin. +# @param XDX,XDY,XDZ Three components of OX direction +# @param YDX,YDY,YDZ Three components of OY direction +# @return New GEOM_Object, containing the created coordinate system. +# +# Example: see GEOM_TestAll.py def MakeMarker(OX,OY,OZ, XDX,XDY,XDZ, YDX,YDY,YDZ): - """ - * Create a local coordinate system. - * \param OX,OY,OZ Three coordinates of coordinate system origin. - * \param XDX,XDY,XDZ Three components of OX direction - * \param YDX,YDY,YDZ Three components of OY direction - * \return New GEOM_Object, containing the created coordinate system. - - * Example: see GEOM_TestAll.py - """ anObj = BasicOp.MakeMarker(OX,OY,OZ, XDX,XDY,XDZ, YDX,YDY,YDZ) if BasicOp.IsDone() == 0: print "MakeMarker : ", BasicOp.GetErrorCode() return anObj +## Create a local coordinate system. +# @param theOrigin Point of coordinate system origin. +# @param theXVec Vector of X direction +# @param theYVec Vector of Y direction +# @return New GEOM_Object, containing the created coordinate system. def MakeMarkerPntTwoVec(theOrigin, theXVec, theYVec): - """ - * Create a local coordinate system. - * \param theOrigin Point of coordinate system origin. - * \param theXVec Vector of X direction - * \param theYVec Vector of Y direction - * \return New GEOM_Object, containing the created coordinate system. - """ O = PointCoordinates( theOrigin ) OXOY = [] for vec in [ theXVec, theYVec ]: @@ -341,156 +323,138 @@ def MakeMarkerPntTwoVec(theOrigin, theXVec, theYVec): # Curves # ----------------------------------------------------------------------------- +## Create an arc of circle, passing through three given points. +# @param thePnt1 Start point of the arc. +# @param thePnt2 Middle point of the arc. +# @param thePnt3 End point of the arc. +# @return New GEOM_Object, containing the created arc. +# +# Example: see GEOM_TestAll.py def MakeArc(thePnt1, thePnt2, thePnt3): - """ - * Create an arc of circle, passing through three given points. - * \param thePnt1 Start point of the arc. - * \param thePnt2 Middle point of the arc. - * \param thePnt3 End point of the arc. - * \return New GEOM_Object, containing the created arc. - - * Example: see GEOM_TestAll.py - """ anObj = CurvesOp.MakeArc(thePnt1, thePnt2, thePnt3) if CurvesOp.IsDone() == 0: print "MakeArc : ", CurvesOp.GetErrorCode() return anObj +## Create a circle with given center, normal vector and radius. +# @param thePnt Circle center. +# @param theVec Vector, normal to the plane of the circle. +# @param theR Circle radius. +# @return New GEOM_Object, containing the created circle. +# +# Example: see GEOM_TestAll.py def MakeCircle(thePnt, theVec, theR): - """ - * Create a circle with given center, normal vector and radius. - * \param thePnt Circle center. - * \param theVec Vector, normal to the plane of the circle. - * \param theR Circle radius. - * \return New GEOM_Object, containing the created circle. - - * Example: see GEOM_TestAll.py - """ anObj = CurvesOp.MakeCirclePntVecR(thePnt, theVec, theR) if CurvesOp.IsDone() == 0: print "MakeCirclePntVecR : ", CurvesOp.GetErrorCode() return anObj +## Create a circle, passing through three given points +# @param thePnt1,thePnt2,thePnt3 Points, defining the circle. +# @return New GEOM_Object, containing the created circle. +# +# Example: see GEOM_TestAll.py def MakeCircleThreePnt(thePnt1, thePnt2, thePnt3): - """ - * Create a circle, passing through three given points - * \param thePnt1,thePnt2,thePnt3 Points, defining the circle. - * \return New GEOM_Object, containing the created circle. - - * Example: see GEOM_TestAll.py - """ anObj = CurvesOp.MakeCircleThreePnt(thePnt1, thePnt2, thePnt3) if CurvesOp.IsDone() == 0: print "MakeCircleThreePnt : ", CurvesOp.GetErrorCode() return anObj +## Create an ellipse with given center, normal vector and radiuses. +# @param thePnt Ellipse center. +# @param theVec Vector, normal to the plane of the ellipse. +# @param theRMajor Major ellipse radius. +# @param theRMinor Minor ellipse radius. +# @return New GEOM_Object, containing the created ellipse. +# +# Example: see GEOM_TestAll.py def MakeEllipse(thePnt, theVec, theRMajor, theRMinor): - """ - * Create an ellipse with given center, normal vector and radiuses. - * \param thePnt Ellipse center. - * \param theVec Vector, normal to the plane of the ellipse. - * \param theRMajor Major ellipse radius. - * \param theRMinor Minor ellipse radius. - * \return New GEOM_Object, containing the created ellipse. - - * Example: see GEOM_TestAll.py - """ anObj = CurvesOp.MakeEllipse(thePnt, theVec, theRMajor, theRMinor) if CurvesOp.IsDone() == 0: print "MakeEllipse : ", CurvesOp.GetErrorCode() return anObj +## Create a polyline on the set of points. +# @param thePoints Sequence of points for the polyline. +# @return New GEOM_Object, containing the created polyline. +# +# Example: see GEOM_TestAll.py def MakePolyline(thePoints): - """ - * Create a polyline on the set of points. - * \param thePoints Sequence of points for the polyline. - * \return New GEOM_Object, containing the created polyline. - - * Example: see GEOM_TestAll.py - """ anObj = CurvesOp.MakePolyline(thePoints) if CurvesOp.IsDone() == 0: print "MakePolyline : ", CurvesOp.GetErrorCode() return anObj +## Create bezier curve on the set of points. +# @param thePoints Sequence of points for the bezier curve. +# @return New GEOM_Object, containing the created bezier curve. +# +# Example: see GEOM_TestAll.py def MakeBezier(thePoints): - """ - * Create bezier curve on the set of points. - * \param thePoints Sequence of points for the bezier curve. - * \return New GEOM_Object, containing the created bezier curve. - - * Example: see GEOM_TestAll.py - """ anObj = CurvesOp.MakeSplineBezier(thePoints) if CurvesOp.IsDone() == 0: print "MakeSplineBezier : ", CurvesOp.GetErrorCode() return anObj +## Create B-Spline curve on the set of points. +# @param thePoints Sequence of points for the B-Spline curve. +# @return New GEOM_Object, containing the created B-Spline curve. +# +# Example: see GEOM_TestAll.py def MakeInterpol(thePoints): - """ - * Create B-Spline curve on the set of points. - * \param thePoints Sequence of points for the B-Spline curve. - * \return New GEOM_Object, containing the created B-Spline curve. - - * Example: see GEOM_TestAll.py - """ anObj = CurvesOp.MakeSplineInterpolation(thePoints) if CurvesOp.IsDone() == 0: print "MakeSplineInterpolation : ", CurvesOp.GetErrorCode() return anObj +## Create a sketcher (wire or face), following the textual description, +# passed through \a theCommand argument. \n +# 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. +# +# Example: see GEOM_TestAll.py def MakeSketcher(theCommand, theWorkingPlane = [0,0,0, 0,0,1, 1,0,0]): - """ - * Create a sketcher (wire or face), following the textual description, - * passed through \a theCommand argument. \n - * 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. - - * Example: see GEOM_TestAll.py - """ anObj = CurvesOp.MakeSketcher(theCommand, theWorkingPlane) if CurvesOp.IsDone() == 0: print "MakeSketcher : ", CurvesOp.GetErrorCode() return anObj +## Create a sketcher (wire or face), following the textual description, +# passed through \a theCommand argument. \n +# For format of the description string see the previous method.\n +# @param theCommand String, defining the sketcher in local +# coordinates of the working plane. +# @param theWorkingPlane Planar Face of the working plane. +# @return New GEOM_Object, containing the created wire. def MakeSketcherOnPlane(theCommand, theWorkingPlane): - """ - * Create a sketcher (wire or face), following the textual description, - * passed through \a theCommand argument. \n - * For format of the description string see the previous method.\n - * \param theCommand String, defining the sketcher in local - * coordinates of the working plane. - * \param theWorkingPlane Planar Face of the working plane. - * \return New GEOM_Object, containing the created wire. - """ anObj = CurvesOp.MakeSketcherOnPlane(theCommand, theWorkingPlane) if CurvesOp.IsDone() == 0: print "MakeSketcher : ", CurvesOp.GetErrorCode() @@ -500,561 +464,526 @@ def MakeSketcherOnPlane(theCommand, theWorkingPlane): # Create 3D Primitives # ----------------------------------------------------------------------------- +## Create a box by coordinates of two opposite vertices. +# +# Example: see GEOM_TestAll.py def MakeBox(x1,y1,z1,x2,y2,z2): - """ - * Create a box by coordinates of two opposite vertices. - - * Example: see GEOM_TestAll.py - """ pnt1 = MakeVertex(x1,y1,z1) pnt2 = MakeVertex(x2,y2,z2) return MakeBoxTwoPnt(pnt1,pnt2) +## Create a box with specified dimensions along the coordinate axes +# and with edges, parallel to the coordinate axes. +# Center of the box will be at point (DX/2, DY/2, DZ/2). +# @param theDX Length of Box edges, parallel to OX axis. +# @param theDY Length of Box edges, parallel to OY axis. +# @param theDZ Length of Box edges, parallel to OZ axis. +# @return New GEOM_Object, containing the created box. +# +# Example: see GEOM_TestAll.py def MakeBoxDXDYDZ(theDX, theDY, theDZ): - """ - * Create a box with specified dimensions along the coordinate axes - * and with edges, parallel to the coordinate axes. - * Center of the box will be at point (DX/2, DY/2, DZ/2). - * \param theDX Length of Box edges, parallel to OX axis. - * \param theDY Length of Box edges, parallel to OY axis. - * \param theDZ Length of Box edges, parallel to OZ axis. - * \return New GEOM_Object, containing the created box. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeBoxDXDYDZ(theDX, theDY, theDZ) if PrimOp.IsDone() == 0: print "MakeBoxDXDYDZ : ", PrimOp.GetErrorCode() return anObj +## Create a box with two specified opposite vertices, +# and with edges, parallel to the coordinate axes +# @param thePnt1 First of two opposite vertices. +# @param thePnt2 Second of two opposite vertices. +# @return New GEOM_Object, containing the created box. +# +# Example: see GEOM_TestAll.py def MakeBoxTwoPnt(thePnt1, thePnt2): - """ - * Create a box with two specified opposite vertices, - * and with edges, parallel to the coordinate axes - * \param thePnt1 First of two opposite vertices. - * \param thePnt2 Second of two opposite vertices. - * \return New GEOM_Object, containing the created box. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeBoxTwoPnt(thePnt1, thePnt2) if PrimOp.IsDone() == 0: print "MakeBoxTwoPnt : ", PrimOp.GetErrorCode() return anObj +## Create a cylinder with given base point, axis, radius and height. +# @param thePnt Central point of cylinder base. +# @param theAxis Cylinder axis. +# @param theR Cylinder radius. +# @param theH Cylinder height. +# @return New GEOM_Object, containing the created cylinder. +# +# Example: see GEOM_TestAll.py def MakeCylinder(thePnt, theAxis, theR, theH): - """ - * Create a cylinder with given base point, axis, radius and height. - * \param thePnt Central point of cylinder base. - * \param theAxis Cylinder axis. - * \param theR Cylinder radius. - * \param theH Cylinder height. - * \return New GEOM_Object, containing the created cylinder. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeCylinderPntVecRH(thePnt, theAxis, theR, theH) if PrimOp.IsDone() == 0: print "MakeCylinderPntVecRH : ", PrimOp.GetErrorCode() return anObj +## Create a cylinder with given radius and height at +# the origin of coordinate system. Axis of the cylinder +# will be collinear to the OZ axis of the coordinate system. +# @param theR Cylinder radius. +# @param theH Cylinder height. +# @return New GEOM_Object, containing the created cylinder. +# +# Example: see GEOM_TestAll.py def MakeCylinderRH(theR, theH): - """ - * Create a cylinder with given radius and height at - * the origin of coordinate system. Axis of the cylinder - * will be collinear to the OZ axis of the coordinate system. - * \param theR Cylinder radius. - * \param theH Cylinder height. - * \return New GEOM_Object, containing the created cylinder. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeCylinderRH(theR, theH) if PrimOp.IsDone() == 0: print "MakeCylinderRH : ", PrimOp.GetErrorCode() return anObj +## Create a sphere with given center and radius. +# @param thePnt Sphere center. +# @param theR Sphere radius. +# @return New GEOM_Object, containing the created sphere. +# +# Example: see GEOM_TestAll.py def MakeSpherePntR(thePnt, theR): - """ - * Create a sphere with given center and radius. - * \param thePnt Sphere center. - * \param theR Sphere radius. - * \return New GEOM_Object, containing the created sphere. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeSpherePntR(thePnt, theR) if PrimOp.IsDone() == 0: print "MakeSpherePntR : ", PrimOp.GetErrorCode() return anObj +## Create a sphere with given center and radius. +# @param x,y,z Coordinates of sphere center. +# @param theR Sphere radius. +# @return New GEOM_Object, containing the created sphere. +# +# Example: see GEOM_TestAll.py def MakeSphere(x, y, z, theR): - """ - * Create a sphere with given center and radius. - * \param x,y,z Coordinates of sphere center. - * \param theR Sphere radius. - * \return New GEOM_Object, containing the created sphere. - - * Example: see GEOM_TestAll.py - """ point = MakeVertex(x, y, z) anObj = MakeSpherePntR(point, theR) return anObj +## Create a sphere with given radius at the origin of coordinate system. +# @param theR Sphere radius. +# @return New GEOM_Object, containing the created sphere. +# +# Example: see GEOM_TestAll.py def MakeSphereR(theR): - """ - * Create a sphere with given radius at the origin of coordinate system. - * \param theR Sphere radius. - * \return New GEOM_Object, containing the created sphere. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeSphereR(theR) if PrimOp.IsDone() == 0: print "MakeSphereR : ", PrimOp.GetErrorCode() return anObj +## Create a cone with given base point, axis, height and radiuses. +# @param thePnt Central point of the first cone base. +# @param theAxis Cone axis. +# @param theR1 Radius of the first cone base. +# @param theR2 Radius of the second cone base. +# \note If both radiuses are non-zero, the cone will be truncated. +# \note If the radiuses are equal, a cylinder will be created instead. +# @param theH Cone height. +# @return New GEOM_Object, containing the created cone. +# +# Example: see GEOM_TestAll.py def MakeCone(thePnt, theAxis, theR1, theR2, theH): - """ - * Create a cone with given base point, axis, height and radiuses. - * \param thePnt Central point of the first cone base. - * \param theAxis Cone axis. - * \param theR1 Radius of the first cone base. - * \param theR2 Radius of the second cone base. - * \note If both radiuses are non-zero, the cone will be truncated. - * \note If the radiuses are equal, a cylinder will be created instead. - * \param theH Cone height. - * \return New GEOM_Object, containing the created cone. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeConePntVecR1R2H(thePnt, theAxis, theR1, theR2, theH) if PrimOp.IsDone() == 0: print "MakeConePntVecR1R2H : ", PrimOp.GetErrorCode() return anObj +## Create a cone with given height and radiuses at +# the origin of coordinate system. Axis of the cone will +# be collinear to the OZ axis of the coordinate system. +# @param theR1 Radius of the first cone base. +# @param theR2 Radius of the second cone base. +# \note If both radiuses are non-zero, the cone will be truncated. +# \note If the radiuses are equal, a cylinder will be created instead. +# @param theH Cone height. +# @return New GEOM_Object, containing the created cone. +# +# Example: see GEOM_TestAll.py def MakeConeR1R2H(theR1, theR2, theH): - """ - * Create a cone with given height and radiuses at - * the origin of coordinate system. Axis of the cone will - * be collinear to the OZ axis of the coordinate system. - * \param theR1 Radius of the first cone base. - * \param theR2 Radius of the second cone base. - * \note If both radiuses are non-zero, the cone will be truncated. - * \note If the radiuses are equal, a cylinder will be created instead. - * \param theH Cone height. - * \return New GEOM_Object, containing the created cone. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeConeR1R2H(theR1, theR2, theH) if PrimOp.IsDone() == 0: print "MakeConeR1R2H : ", PrimOp.GetErrorCode() return anObj +## Create a torus with given center, normal vector and radiuses. +# @param thePnt Torus central point. +# @param theVec Torus axis of symmetry. +# @param theRMajor Torus major radius. +# @param theRMinor Torus minor radius. +# @return New GEOM_Object, containing the created torus. +# +# Example: see GEOM_TestAll.py def MakeTorus(thePnt, theVec, theRMajor, theRMinor): - """ - * Create a torus with given center, normal vector and radiuses. - * \param thePnt Torus central point. - * \param theVec Torus axis of symmetry. - * \param theRMajor Torus major radius. - * \param theRMinor Torus minor radius. - * \return New GEOM_Object, containing the created torus. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeTorusPntVecRR(thePnt, theVec, theRMajor, theRMinor) if PrimOp.IsDone() == 0: print "MakeTorusPntVecRR : ", PrimOp.GetErrorCode() return anObj +## Create a torus with given radiuses at the origin of coordinate system. +# @param theRMajor Torus major radius. +# @param theRMinor Torus minor radius. +# @return New GEOM_Object, containing the created torus. +# +# Example: see GEOM_TestAll.py def MakeTorusRR(theRMajor, theRMinor): - """ - * Create a torus with given radiuses at the origin of coordinate system. - * \param theRMajor Torus major radius. - * \param theRMinor Torus minor radius. - * \return New GEOM_Object, containing the created torus. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeTorusRR(theRMajor, theRMinor) if PrimOp.IsDone() == 0: print "MakeTorusRR : ", PrimOp.GetErrorCode() return anObj +## Create a shape by extrusion of the base shape along a vector, defined by two points. +# @param theBase Base shape to be extruded. +# @param thePoint1 First end of extrusion vector. +# @param thePoint2 Second end of extrusion vector. +# @return New GEOM_Object, containing the created prism. +# +# Example: see GEOM_TestAll.py def MakePrism(theBase, thePoint1, thePoint2): - """ - * Create a shape by extrusion of the base shape along a vector, defined by two points. - * \param theBase Base shape to be extruded. - * \param thePoint1 First end of extrusion vector. - * \param thePoint2 Second end of extrusion vector. - * \return New GEOM_Object, containing the created prism. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakePrismTwoPnt(theBase, thePoint1, thePoint2) if PrimOp.IsDone() == 0: print "MakePrismTwoPnt : ", PrimOp.GetErrorCode() return anObj +## Create a shape by extrusion of the base shape along the vector, +# i.e. all the space, transfixed by the base shape during its translation +# along the vector on the given distance. +# @param theBase Base shape to be extruded. +# @param theVec Direction of extrusion. +# @param theH Prism dimension along theVec. +# @return New GEOM_Object, containing the created prism. +# +# Example: see GEOM_TestAll.py def MakePrismVecH(theBase, theVec, theH): - """ - * Create a shape by extrusion of the base shape along the vector, - * i.e. all the space, transfixed by the base shape during its translation - * along the vector on the given distance. - * \param theBase Base shape to be extruded. - * \param theVec Direction of extrusion. - * \param theH Prism dimension along theVec. - * \return New GEOM_Object, containing the created prism. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakePrismVecH(theBase, theVec, theH) if PrimOp.IsDone() == 0: print "MakePrismVecH : ", PrimOp.GetErrorCode() return anObj +## Create a shape by extrusion of the base shape along +# the path shape. The path shape can be a wire or an edge. +# @param theBase Base shape to be extruded. +# @param thePath Path shape to extrude the base shape along it. +# @return New GEOM_Object, containing the created pipe. +# +# Example: see GEOM_TestAll.py def MakePipe(theBase, thePath): - """ - * Create a shape by extrusion of the base shape along - * the path shape. The path shape can be a wire or an edge. - * \param theBase Base shape to be extruded. - * \param thePath Path shape to extrude the base shape along it. - * \return New GEOM_Object, containing the created pipe. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakePipe(theBase, thePath) if PrimOp.IsDone() == 0: print "MakePipe : ", PrimOp.GetErrorCode() return anObj +## Create a shape by revolution of the base shape around the axis +# on the given angle, i.e. all the space, transfixed by the base +# shape during its rotation around the axis on the given angle. +# @param theBase Base shape to be rotated. +# @param theAxis Rotation axis. +# @param theAngle Rotation angle in radians. +# @return New GEOM_Object, containing the created revolution. +# +# Example: see GEOM_TestAll.py def MakeRevolution(theBase, theAxis, theAngle): - """ - * Create a shape by revolution of the base shape around the axis - * on the given angle, i.e. all the space, transfixed by the base - * shape during its rotation around the axis on the given angle. - * \param theBase Base shape to be rotated. - * \param theAxis Rotation axis. - * \param theAngle Rotation angle in radians. - * \return New GEOM_Object, containing the created revolution. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeRevolutionAxisAngle(theBase, theAxis, theAngle) if PrimOp.IsDone() == 0: print "MakeRevolutionAxisAngle : ", PrimOp.GetErrorCode() return anObj +## Create a shell or solid passing through set of sections.Sections should be wires,edges or vertices. +# @param theSeqSections - set of specified sections. +# @param theModeSolid - mode defining building solid or shell +# @param thePreci - precision 3D used for smoothing by default 1.e-6 +# @param theRuled - mode defining type of the result surfaces (ruled or smoothed). +# @return New GEOM_Object, containing the created shell or solid. +# +# Example: see GEOM_TestAll.py +def MakeThruSections(theSeqSections,theModeSolid,thePreci,theRuled): + anObj = PrimOp.MakeThruSections(theSeqSections,theModeSolid,thePreci,theRuled) + if PrimOp.IsDone() == 0: + print "MakeThruSections : ", PrimOp.GetErrorCode() + return anObj + +## Create a shape by extrusion of the profile shape along +# the path shape. The path shape can be a wire or an edge. +# the several profiles can be specified in the several locations of path. +# @param theSeqBases - list of Bases shape to be extruded. +# @param theLocations - list of locations on the path corresponding +# specified list of the Bases shapes. Number of locations +# should be equal to number of bases or list of locations can be empty. +# @param thePath - Path shape to extrude the base shape along it. +# @param theWithContact - the mode defining that the section is translated to be in +# contact with the spine. +# @param - WithCorrection - defining that the section is rotated to be +# orthogonal to the spine tangent in the correspondent point +# @return New GEOM_Object, containing the created pipe. +# +# Example: see GEOM_TestAll.py +def MakePipeWithDifferentSections(theSeqBases, theLocations,thePath,theWithContact,theWithCorrection): + anObj = PrimOp.MakePipeWithDifferentSections(theSeqBases, theLocations,thePath,theWithContact,theWithCorrection) + if PrimOp.IsDone() == 0: + print "MakePipeWithDifferentSections : ", PrimOp.GetErrorCode() + return anObj + # ----------------------------------------------------------------------------- # Create base shapes # ----------------------------------------------------------------------------- +## Create a linear edge with specified ends. +# @param thePnt1 Point for the first end of edge. +# @param thePnt2 Point for the second end of edge. +# @return New GEOM_Object, containing the created edge. +# +# Example: see GEOM_TestAll.py def MakeEdge(thePnt1, thePnt2): - """ - * Create a linear edge with specified ends. - * \param thePnt1 Point for the first end of edge. - * \param thePnt2 Point for the second end of edge. - * \return New GEOM_Object, containing the created edge. - - * Example: see GEOM_TestAll.py - """ anObj = ShapesOp.MakeEdge(thePnt1, thePnt2) if ShapesOp.IsDone() == 0: print "MakeEdge : ", ShapesOp.GetErrorCode() return anObj +## Create a wire from the set of edges and wires. +# @param theEdgesAndWires List of edges and/or wires. +# @return New GEOM_Object, containing the created wire. +# +# Example: see GEOM_TestAll.py def MakeWire(theEdgesAndWires): - """ - * Create a wire from the set of edges and wires. - * \param theEdgesAndWires List of edges and/or wires. - * \return New GEOM_Object, containing the created wire. - - * Example: see GEOM_TestAll.py - """ anObj = ShapesOp.MakeWire(theEdgesAndWires) if ShapesOp.IsDone() == 0: print "MakeWire : ", ShapesOp.GetErrorCode() return anObj +## Create a face on the given wire. +# @param theWire Wire to build the face on. +# @param isPlanarWanted If TRUE, only planar face will be built. +# If impossible, NULL object will be returned. +# @return New GEOM_Object, containing the created face. +# +# Example: see GEOM_TestAll.py def MakeFace(theWire, isPlanarWanted): - """ - * Create a face on the given wire. - * \param theWire Wire to build the face on. - * \param isPlanarWanted If TRUE, only planar face will be built. - * If impossible, NULL object will be returned. - * \return New GEOM_Object, containing the created face. - - * Example: see GEOM_TestAll.py - """ anObj = ShapesOp.MakeFace(theWire, isPlanarWanted) if ShapesOp.IsDone() == 0: print "MakeFace : ", ShapesOp.GetErrorCode() return anObj +## Create a face on the given wires set. +# @param theWires List of wires to build the face on. +# @param isPlanarWanted If TRUE, only planar face will be built. +# If impossible, NULL object will be returned. +# @return New GEOM_Object, containing the created face. +# +# Example: see GEOM_TestAll.py def MakeFaceWires(theWires, isPlanarWanted): - """ - * Create a face on the given wires set. - * \param theWires List of wires to build the face on. - * \param isPlanarWanted If TRUE, only planar face will be built. - * If impossible, NULL object will be returned. - * \return New GEOM_Object, containing the created face. - - * Example: see GEOM_TestAll.py - """ anObj = ShapesOp.MakeFaceWires(theWires, isPlanarWanted) if ShapesOp.IsDone() == 0: print "MakeFaceWires : ", ShapesOp.GetErrorCode() return anObj +## Shortcut to MakeFaceWires() +# +# Example: see GEOM_TestOthers.py def MakeFaces(theWires, isPlanarWanted): - """ - * Shortcut to MakeFaceWires() - - * Example: see GEOM_TestOthers.py - """ anObj = MakeFaceWires(theWires, isPlanarWanted) return anObj +## Create a shell from the set of faces and shells. +# @param theFacesAndShells List of faces and/or shells. +# @return New GEOM_Object, containing the created shell. +# +# Example: see GEOM_TestAll.py def MakeShell(theFacesAndShells): - """ - * Create a shell from the set of faces and shells. - * \param theFacesAndShells List of faces and/or shells. - * \return New GEOM_Object, containing the created shell. - - * Example: see GEOM_TestAll.py - """ anObj = ShapesOp.MakeShell(theFacesAndShells) if ShapesOp.IsDone() == 0: print "MakeShell : ", ShapesOp.GetErrorCode() return anObj +## Create a solid, bounded by the given shells. +# @param theShells Sequence of bounding shells. +# @return New GEOM_Object, containing the created solid. +# +# Example: see GEOM_TestAll.py def MakeSolid(theShells): - """ - * Create a solid, bounded by the given shells. - * \param theShells Sequence of bounding shells. - * \return New GEOM_Object, containing the created solid. - - * Example: see GEOM_TestAll.py - """ anObj = ShapesOp.MakeSolidShells(theShells) if ShapesOp.IsDone() == 0: print "MakeSolid : ", ShapesOp.GetErrorCode() return anObj +## Create a compound of the given shapes. +# @param theShapes List of shapes to put in compound. +# @return New GEOM_Object, containing the created compound. +# +# Example: see GEOM_TestAll.py def MakeCompound(theShapes): - """ - * Create a compound of the given shapes. - * \param theShapes List of shapes to put in compound. - * \return New GEOM_Object, containing the created compound. - - * Example: see GEOM_TestAll.py - """ anObj = ShapesOp.MakeCompound(theShapes) if ShapesOp.IsDone() == 0: print "MakeCompound : ", ShapesOp.GetErrorCode() return anObj +## Gives quantity of faces in the given shape. +# @param theShape Shape to count faces of. +# @return Quantity of faces. +# +# Example: see GEOM_TestOthers.py def NumberOfFaces(theShape): - """ - * Gives quantity of faces in the given shape. - * \param theShape Shape to count faces of. - * \return Quantity of faces. - - * Example: see GEOM_TestOthers.py - """ nb_faces = ShapesOp.NumberOfFaces(theShape) if ShapesOp.IsDone() == 0: print "NumberOfFaces : ", ShapesOp.GetErrorCode() return nb_faces +## Gives quantity of edges in the given shape. +# @param theShape Shape to count edges of. +# @return Quantity of edges. +# +# Example: see GEOM_TestOthers.py def NumberOfEdges(theShape): - """ - * Gives quantity of edges in the given shape. - * \param theShape Shape to count edges of. - * \return Quantity of edges. - - * Example: see GEOM_TestOthers.py - """ nb_edges = ShapesOp.NumberOfEdges(theShape) if ShapesOp.IsDone() == 0: print "NumberOfEdges : ", ShapesOp.GetErrorCode() return nb_edges +## Reverses an orientation the given shape. +# @param theShape Shape to be reversed. +# @return The reversed copy of theShape. +# +# Example: see GEOM_TestAll.py def ChangeOrientation(theShape): - """ - * Reverses an orientation the given shape. - * \param theShape Shape to be reversed. - * \return The reversed copy of theShape. - - * Example: see GEOM_TestAll.py - """ anObj = ShapesOp.ChangeOrientation(theShape) if ShapesOp.IsDone() == 0: print "ChangeOrientation : ", ShapesOp.GetErrorCode() return anObj +## Shortcut to ChangeOrientation() +# +# Example: see GEOM_TestOthers.py def OrientationChange(theShape): - """ - * Shortcut to ChangeOrientation() - - * Example: see GEOM_TestOthers.py - """ anObj = ChangeOrientation(theShape) return anObj +## Retrieve all free faces from the given shape. +# Free face is a face, which is not shared between two shells of the shape. +# @param theShape Shape to find free faces in. +# @return List of IDs of all free faces, contained in theShape. +# +# Example: see GEOM_TestOthers.py def GetFreeFacesIDs(theShape): - """ - * Retrieve all free faces from the given shape. - * Free face is a face, which is not shared between two shells of the shape. - * \param theShape Shape to find free faces in. - * \return List of IDs of all free faces, contained in theShape. - - * Example: see GEOM_TestOthers.py - """ anIDs = ShapesOp.GetFreeFacesIDs(theShape) if ShapesOp.IsDone() == 0: print "GetFreeFacesIDs : ", ShapesOp.GetErrorCode() return anIDs +## Get all sub-shapes of theShape1 of the given type, shared with theShape2. +# @param theShape1 Shape to find sub-shapes in. +# @param theShape2 Shape to find shared sub-shapes with. +# @param theShapeType Type of sub-shapes to be retrieved. +# @return List of sub-shapes of theShape1, shared with theShape2. +# +# Example: see GEOM_TestOthers.py def GetSharedShapes(theShape1, theShape2, theShapeType): - """ - * Get all sub-shapes of theShape1 of the given type, shared with theShape2. - * \param theShape1 Shape to find sub-shapes in. - * \param theShape2 Shape to find shared sub-shapes with. - * \param theShapeType Type of sub-shapes to be retrieved. - * \return List of sub-shapes of theShape1, shared with theShape2. - - * Example: see GEOM_TestOthers.py - """ aList = ShapesOp.GetSharedShapes(theShape1, theShape2, theShapeType) if ShapesOp.IsDone() == 0: print "GetSharedShapes : ", ShapesOp.GetErrorCode() return aList +## Find in \a theShape all sub-shapes of type \a theShapeType, situated relatively +# the specified plane by the certain way, defined through \a theState parameter. +# @param theShape Shape to find sub-shapes of. +# @param theShapeType Type of sub-shapes to be retrieved. +# @param theAx1 Vector (or line, or linear edge), specifying normal +# direction and location of the plane to find shapes on. +# @param theState The state of the subshapes to find. It can be one of +# ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. +# @return List of all found sub-shapes. +# +# Example: see GEOM_TestOthers.py def GetShapesOnPlane(theShape, theShapeType, theAx1, theState): - """ - * Find in \a theShape all sub-shapes of type \a theShapeType, situated relatively - * the specified plane by the certain way, defined through \a theState parameter. - * \param theShape Shape to find sub-shapes of. - * \param theShapeType Type of sub-shapes to be retrieved. - * \param theAx1 Vector (or line, or linear edge), specifying normal - * direction and location of the plane to find shapes on. - * \param theState The state of the subshapes to find. It can be one of - * ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. - * \return List of all found sub-shapes. - - * Example: see GEOM_TestOthers.py - """ aList = ShapesOp.GetShapesOnPlane(theShape, theShapeType, theAx1, theState) if ShapesOp.IsDone() == 0: print "GetShapesOnPlane : ", ShapesOp.GetErrorCode() return aList +## Works like the above method, but returns list of sub-shapes indices +# +# Example: see GEOM_TestOthers.py def GetShapesOnPlaneIDs(theShape, theShapeType, theAx1, theState): - """ - * Works like the above method, but returns list of sub-shapes indices - """ aList = ShapesOp.GetShapesOnPlaneIDs(theShape, theShapeType, theAx1, theState) if ShapesOp.IsDone() == 0: print "GetShapesOnPlaneIDs : ", ShapesOp.GetErrorCode() return aList +## Find in \a theShape all sub-shapes of type \a theShapeType, situated relatively +# the specified cylinder by the certain way, defined through \a theState parameter. +# @param theShape Shape to find sub-shapes of. +# @param theShapeType Type of sub-shapes to be retrieved. +# @param theAxis Vector (or line, or linear edge), specifying +# axis of the cylinder to find shapes on. +# @param theRadius Radius of the cylinder to find shapes on. +# @param theState The state of the subshapes to find. It can be one of +# ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. +# @return List of all found sub-shapes. +# +# Example: see GEOM_TestOthers.py def GetShapesOnCylinder(theShape, theShapeType, theAxis, theRadius, theState): - """ - * Find in \a theShape all sub-shapes of type \a theShapeType, situated relatively - * the specified cylinder by the certain way, defined through \a theState parameter. - * \param theShape Shape to find sub-shapes of. - * \param theShapeType Type of sub-shapes to be retrieved. - * \param theAxis Vector (or line, or linear edge), specifying - * axis of the cylinder to find shapes on. - * \param theRadius Radius of the cylinder to find shapes on. - * \param theState The state of the subshapes to find. It can be one of - * ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. - * \return List of all found sub-shapes. - - * Example: see GEOM_TestOthers.py - """ aList = ShapesOp.GetShapesOnCylinder(theShape, theShapeType, theAxis, theRadius, theState) if ShapesOp.IsDone() == 0: print "GetShapesOnCylinder : ", ShapesOp.GetErrorCode() return aList +## Works like the above method, but returns list of sub-shapes indices +# +# Example: see GEOM_TestOthers.py def GetShapesOnCylinderIDs(theShape, theShapeType, theAxis, theRadius, theState): - """ - * Works like the above method, but returns list of sub-shapes indices - """ aList = ShapesOp.GetShapesOnCylinderIDs(theShape, theShapeType, theAxis, theRadius, theState) if ShapesOp.IsDone() == 0: print "GetShapesOnCylinderIDs : ", ShapesOp.GetErrorCode() return aList +## Find in \a theShape all sub-shapes of type \a theShapeType, situated relatively +# the specified sphere by the certain way, defined through \a theState parameter. +# @param theShape Shape to find sub-shapes of. +# @param theShapeType Type of sub-shapes to be retrieved. +# @param theCenter Point, specifying center of the sphere to find shapes on. +# @param theRadius Radius of the sphere to find shapes on. +# @param theState The state of the subshapes to find. It can be one of +# ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. +# @return List of all found sub-shapes. +# +# Example: see GEOM_TestOthers.py def GetShapesOnSphere(theShape, theShapeType, theCenter, theRadius, theState): - """ - * Find in \a theShape all sub-shapes of type \a theShapeType, situated relatively - * the specified sphere by the certain way, defined through \a theState parameter. - * \param theShape Shape to find sub-shapes of. - * \param theShapeType Type of sub-shapes to be retrieved. - * \param theCenter Point, specifying center of the sphere to find shapes on. - * \param theRadius Radius of the sphere to find shapes on. - * \param theState The state of the subshapes to find. It can be one of - * ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. - * \return List of all found sub-shapes. - - * Example: see GEOM_TestOthers.py - """ aList = ShapesOp.GetShapesOnSphere(theShape, theShapeType, theCenter, theRadius, theState) if ShapesOp.IsDone() == 0: print "GetShapesOnSphere : ", ShapesOp.GetErrorCode() return aList +## Works like the above method, but returns list of sub-shapes indices +# +# Example: see GEOM_TestOthers.py def GetShapesOnSphereIDs(theShape, theShapeType, theCenter, theRadius, theState): - """ - * Works like the above method, but returns list of sub-shapes indices - """ aList = ShapesOp.GetShapesOnSphereIDs(theShape, theShapeType, theCenter, theRadius, theState) if ShapesOp.IsDone() == 0: print "GetShapesOnSphereIDs : ", ShapesOp.GetErrorCode() return aList +## Find in \a theShape all sub-shapes of type \a theShapeType, situated relatively +# the specified quadrangle by the certain way, defined through \a theState parameter. +# @param theShape Shape to find sub-shapes of. +# @param theShapeType Type of sub-shapes to be retrieved. +# @param theCenter Point, specifying center of the sphere to find shapes on. +# @param theRadius Radius of the sphere to find shapes on. +# @param theState The state of the subshapes to find. It can be one of +# ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. +# @return List of all found sub-shapes. +# +# Example: see GEOM_TestOthers.py def GetShapesOnQuadrangle(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState): - """ - * Find in \a theShape all sub-shapes of type \a theShapeType, situated relatively - * the specified quadrangle by the certain way, defined through \a theState parameter. - * \param theShape Shape to find sub-shapes of. - * \param theShapeType Type of sub-shapes to be retrieved. - * \param theCenter Point, specifying center of the sphere to find shapes on. - * \param theRadius Radius of the sphere to find shapes on. - * \param theState The state of the subshapes to find. It can be one of - * ST_ON, ST_OUT, ST_ONOUT, ST_IN, ST_ONIN. - * \return List of all found sub-shapes. - - * Example: see GEOM_TestOthers.py - """ aList = ShapesOp.GetShapesOnQuadrangle(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState) if ShapesOp.IsDone() == 0: print "GetShapesOnQuadrangle : ", ShapesOp.GetErrorCode() return aList +## Works like the above method, but returns list of sub-shapes indices +# +# Example: see GEOM_TestOthers.py def GetShapesOnQuadrangleIDs(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState): - """ - * Works like the above method, but returns list of sub-shapes indices - """ aList = ShapesOp.GetShapesOnQuadrangleIDs(theShape, theShapeType, theTopLeftPoint, theTopRigthPoint, theBottomLeftPoint, theBottomRigthPoint, theState) if ShapesOp.IsDone() == 0: print "GetShapesOnQuadrangleIDs : ", ShapesOp.GetErrorCode() return aList +## Get sub-shape(s) of theShapeWhere, which are +# coincident with \a theShapeWhat or could be a part of it. +# @param theShapeWhere Shape to find sub-shapes of. +# @param theShapeWhat Shape, specifying what to find. +# @return Group of all found sub-shapes or a single found sub-shape. +# +# Example: see GEOM_TestOthers.py def GetInPlace(theShapeWhere, theShapeWhat): - """ - * Get sub-shape(s) of theShapeWhere, which are - * coincident with \a theShapeWhat or could be a part of it. - * \param theShapeWhere Shape to find sub-shapes of. - * \param theShapeWhat Shape, specifying what to find. - * \return Group of all found sub-shapes or a single found sub-shape. - - * Example: see GEOM_TestOthers.py - """ anObj = ShapesOp.GetInPlace(theShapeWhere, theShapeWhat) if ShapesOp.IsDone() == 0: print "GetInPlace : ", ShapesOp.GetErrorCode() @@ -1064,22 +993,18 @@ def GetInPlace(theShapeWhere, theShapeWhat): # Access to sub-shapes by their unique IDs inside the main shape. # ----------------------------------------------------------------------------- +## Obtain a composite sub-shape of , composed from sub-shapes +# of , selected by their unique IDs inside +# +# Example: see GEOM_TestAll.py def GetSubShape(aShape, ListOfID): - """ - * Obtain a composite sub-shape of , composed from sub-shapes - * of , selected by their unique IDs inside - - * Example: see GEOM_TestAll.py - """ anObj = geom.AddSubShape(aShape,ListOfID) return anObj +## Obtain unique ID of sub-shape inside +# +# Example: see GEOM_TestAll.py def GetSubShapeID(aShape, aSubShape): - """ - * Obtain unique ID of sub-shape inside - - * Example: see GEOM_TestAll.py - """ anID = LocalOp.GetSubShapeIndex(aShape, aSubShape) if LocalOp.IsDone() == 0: print "GetSubShapeIndex : ", LocalOp.GetErrorCode() @@ -1089,68 +1014,58 @@ def GetSubShapeID(aShape, aSubShape): # Decompose objects # ----------------------------------------------------------------------------- +## Explode a shape on subshapes of a given type. +# @param theShape Shape to be exploded. +# @param theShapeType Type of sub-shapes to be retrieved. +# @return List of sub-shapes of type theShapeType, contained in theShape. +# +# Example: see GEOM_TestAll.py def SubShapeAll(aShape, aType): - """ - * Explode a shape on subshapes of a given type. - * \param theShape Shape to be exploded. - * \param theShapeType Type of sub-shapes to be retrieved. - * \return List of sub-shapes of type theShapeType, contained in theShape. - - * Example: see GEOM_TestAll.py - """ ListObj = ShapesOp.MakeExplode(aShape,aType,0) if ShapesOp.IsDone() == 0: print "MakeExplode : ", ShapesOp.GetErrorCode() return ListObj +## Explode a shape on subshapes of a given type. +# @param theShape Shape to be exploded. +# @param theShapeType Type of sub-shapes to be retrieved. +# @return List of IDs of sub-shapes. def SubShapeAllIDs(aShape, aType): - """ - * Explode a shape on subshapes of a given type. - * \param theShape Shape to be exploded. - * \param theShapeType Type of sub-shapes to be retrieved. - * \return List of IDs of sub-shapes. - """ ListObj = ShapesOp.SubShapeAllIDs(aShape,aType,0) if ShapesOp.IsDone() == 0: print "SubShapeAllIDs : ", ShapesOp.GetErrorCode() return ListObj +## Explode a shape on subshapes of a given type. +# Sub-shapes will be sorted by coordinates of their gravity centers. +# @param theShape Shape to be exploded. +# @param theShapeType Type of sub-shapes to be retrieved. +# @return List of sub-shapes of type theShapeType, contained in theShape. +# +# Example: see GEOM_TestAll.py def SubShapeAllSorted(aShape, aType): - """ - * Explode a shape on subshapes of a given type. - * Sub-shapes will be sorted by coordinates of their gravity centers. - * \param theShape Shape to be exploded. - * \param theShapeType Type of sub-shapes to be retrieved. - * \return List of sub-shapes of type theShapeType, contained in theShape. - - * Example: see GEOM_TestAll.py - """ ListObj = ShapesOp.MakeExplode(aShape,aType,1) if ShapesOp.IsDone() == 0: print "MakeExplode : ", ShapesOp.GetErrorCode() return ListObj +## Explode a shape on subshapes of a given type. +# Sub-shapes will be sorted by coordinates of their gravity centers. +# @param theShape Shape to be exploded. +# @param theShapeType Type of sub-shapes to be retrieved. +# @return List of IDs of sub-shapes. def SubShapeAllSortedIDs(aShape, aType): - """ - * Explode a shape on subshapes of a given type. - * Sub-shapes will be sorted by coordinates of their gravity centers. - * \param theShape Shape to be exploded. - * \param theShapeType Type of sub-shapes to be retrieved. - * \return List of IDs of sub-shapes. - """ ListIDs = ShapesOp.SubShapeAllIDs(aShape,aType,1) if ShapesOp.IsDone() == 0: print "SubShapeAllSortedIDs : ", ShapesOp.GetErrorCode() return ListObj +## Obtain a compound of sub-shapes of , +# selected by they indices in list of all sub-shapes of type . +# Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type] +# +# Example: see GEOM_TestAll.py def SubShape(aShape, aType, ListOfInd): - """ - * Obtain a compound of sub-shapes of , - * selected by they indices in list of all sub-shapes of type . - * Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type] - - * Example: see GEOM_TestAll.py - """ ListOfIDs = [] AllShapeList = SubShapeAll(aShape, aType) for ind in ListOfInd: @@ -1158,14 +1073,12 @@ def SubShape(aShape, aType, ListOfInd): anObj = GetSubShape(aShape, ListOfIDs) return anObj +## Obtain a compound of sub-shapes of , +# selected by they indices in sorted list of all sub-shapes of type . +# Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type] +# +# Example: see GEOM_TestAll.py def SubShapeSorted(aShape, aType, ListOfInd): - """ - * Obtain a compound of sub-shapes of , - * selected by they indices in sorted list of all sub-shapes of type . - * Each index is in range [1, Nb_Sub-Shapes_Of_Given_Type] - - * Example: see GEOM_TestAll.py - """ ListOfIDs = [] AllShapeList = SubShapeAllSorted(aShape, aType) for ind in ListOfInd: @@ -1177,141 +1090,123 @@ def SubShapeSorted(aShape, aType, ListOfInd): # Healing operations # ----------------------------------------------------------------------------- +## Apply a sequence of Shape Healing operators to the given object. +# @param theShape Shape to be processed. +# @param theOperators List of names of operators ("FixShape", "SplitClosedFaces", etc.). +# @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 \a theParameters list. +# @return New GEOM_Object, containing processed shape. +# +# Example: see GEOM_TestHealing.py def ProcessShape(theShape, theOperators, theParameters, theValues): - """ - * Apply a sequence of Shape Healing operators to the given object. - * \param theShape Shape to be processed. - * \param theOperators List of names of operators ("FixShape", "SplitClosedFaces", etc.). - * \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 \a theParameters list. - * \return New GEOM_Object, containing processed shape. - - * Example: see GEOM_TestHealing.py - """ anObj = HealOp.ProcessShape(theShape, theOperators, theParameters, theValues) if HealOp.IsDone() == 0: print "ProcessShape : ", HealOp.GetErrorCode() return anObj +## Remove faces from the given object (shape). +# @param theObject Shape to be processed. +# @param theFaces Indices of faces to be removed, if EMPTY then the method +# removes ALL faces of the given object. +# @return New GEOM_Object, containing processed shape. +# +# Example: see GEOM_TestHealing.py def SuppressFaces(theObject, theFaces): - """ - * Remove faces from the given object (shape). - * \param theObject Shape to be processed. - * \param theFaces Indices of faces to be removed, if EMPTY then the method - * removes ALL faces of the given object. - * \return New GEOM_Object, containing processed shape. - - * Example: see GEOM_TestHealing.py - """ anObj = HealOp.SuppressFaces(theObject, theFaces) if HealOp.IsDone() == 0: print "SuppressFaces : ", HealOp.GetErrorCode() return anObj +## Sewing of some shapes into single shape. +# +# Example: see GEOM_TestHealing.py def MakeSewing(ListShape, theTolerance): - """ - * Sewing of some shapes into single shape. - - * Example: see GEOM_TestHealing.py - """ comp = MakeCompound(ListShape) anObj = Sew(comp, theTolerance) return anObj +## Sewing of the given object. +# @param theObject Shape to be processed. +# @param theTolerance Required tolerance value. +# @return New GEOM_Object, containing processed shape. +# +# Example: see MakeSewing() above def Sew(theObject, theTolerance): - """ - * Sewing of the given object. - * \param theObject Shape to be processed. - * \param theTolerance Required tolerance value. - * \return New GEOM_Object, containing processed shape. - - * Example: see MakeSewing() above - """ anObj = HealOp.Sew(theObject, theTolerance) if HealOp.IsDone() == 0: print "Sew : ", HealOp.GetErrorCode() return anObj +## Remove internal wires and edges from the given object (face). +# @param theObject Shape to be processed. +# @param theWires Indices of wires to be removed, if EMPTY then the method +# removes ALL internal wires of the given object. +# @return New GEOM_Object, containing processed shape. +# +# Example: see GEOM_TestHealing.py def SuppressInternalWires(theObject, theWires): - """ - * Remove internal wires and edges from the given object (face). - * \param theObject Shape to be processed. - * \param theWires Indices of wires to be removed, if EMPTY then the method - * removes ALL internal wires of the given object. - * \return New GEOM_Object, containing processed shape. - - * Example: see GEOM_TestHealing.py - """ anObj = HealOp.RemoveIntWires(theObject, theWires) if HealOp.IsDone() == 0: print "SuppressInternalWires : ", HealOp.GetErrorCode() return anObj +## Remove internal closed contours (holes) from the given object. +# @param theObject Shape to be processed. +# @param theWires Indices of wires to be removed, if EMPTY then the method +# removes ALL internal holes of the given object +# @return New GEOM_Object, containing processed shape. +# +# Example: see GEOM_TestHealing.py def SuppressHoles(theObject, theWires): - """ - * Remove internal closed contours (holes) from the given object. - * \param theObject Shape to be processed. - * \param theWires Indices of wires to be removed, if EMPTY then the method - * removes ALL internal holes of the given object - * \return New GEOM_Object, containing processed shape. - - * Example: see GEOM_TestHealing.py - """ anObj = HealOp.FillHoles(theObject, theWires) if HealOp.IsDone() == 0: print "SuppressHoles : ", HealOp.GetErrorCode() return anObj +## Close an open wire. +# @param theObject Shape to be processed. +# @param theWires Indexes of edge(s) and wire(s) to be closed within theObject's shape, +# if -1, then theObject itself is a wire. +# @param isCommonVertex If TRUE : closure by creation of a common vertex, +# If FALS : closure by creation of an edge between ends. +# @return New GEOM_Object, containing processed shape. +# +# Example: see GEOM_TestHealing.py def CloseContour(theObject, theWires, isCommonVertex): - """ - * Close an open wire. - * \param theObject Shape to be processed. - * \param theWires Indexes of edge(s) and wire(s) to be closed within theObject's shape, - * if -1, then theObject itself is a wire. - * \param isCommonVertex If TRUE : closure by creation of a common vertex, - * If FALS : closure by creation of an edge between ends. - * \return New GEOM_Object, containing processed shape. - - * Example: see GEOM_TestHealing.py - """ anObj = HealOp.CloseContour(theObject, theWires, isCommonVertex) if HealOp.IsDone() == 0: print "CloseContour : ", HealOp.GetErrorCode() return anObj +## Addition of a point to a given edge object. +# @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 \a isByParameter. +# @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. +# +# Example: see GEOM_TestHealing.py def DivideEdge(theObject, theEdgeIndex, theValue, isByParameter): - """ - * Addition of a point to a given edge object. - * \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 \a isByParameter. - * \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. - - * Example: see GEOM_TestHealing.py - """ anObj = HealOp.DivideEdge(theObject, theEdgeIndex, theValue, isByParameter) if HealOp.IsDone() == 0: print "DivideEdge : ", HealOp.GetErrorCode() return anObj +## Get a list of wires (wrapped in GEOM_Object-s), +# that constitute a free boundary of the given shape. +# @param theObject Shape to get free boundary of. +# @return [status, theClosedWires, theOpenWires] +# status: FALSE, if an error(s) occured during the method execution. +# theClosedWires: Closed wires on the free boundary of the given shape. +# theOpenWires: Open wires on the free boundary of the given shape. +# +# Example: see GEOM_TestHealing.py def GetFreeBoundary(theObject): - """ - * Get a list of wires (wrapped in GEOM_Object-s), - * that constitute a free boundary of the given shape. - * \param theObject Shape to get free boundary of. - * \return [status, theClosedWires, theOpenWires] - * status: FALSE, if an error(s) occured during the method execution. - * theClosedWires: Closed wires on the free boundary of the given shape. - * theOpenWires: Open wires on the free boundary of the given shape. - - * Example: see GEOM_TestHealing.py - """ anObj = HealOp.GetFreeBoundary(theObject) if HealOp.IsDone() == 0: print "GetFreeBoundaries : ", HealOp.GetErrorCode() @@ -1321,44 +1216,38 @@ def GetFreeBoundary(theObject): # Create advanced objects # ----------------------------------------------------------------------------- +## Create a copy of the given object +# +# Example: see GEOM_TestAll.py def MakeCopy(theOriginal): - """ - * Create a copy of the given object - - * Example: see GEOM_TestAll.py - """ anObj = InsertOp.MakeCopy(theOriginal) if InsertOp.IsDone() == 0: print "MakeCopy : ", InsertOp.GetErrorCode() return anObj +## Create a filling from the given compound of contours. +# @param theShape the compound of contours +# @param theMinDeg a minimal degree +# @param theMaxDeg a maximal degree +# @param theTol2D a 2d tolerance +# @param theTol3D a 3d tolerance +# @param theNbIter a number of iteration +# @return New GEOM_Object, containing the created filling surface. +# +# Example: see GEOM_TestAll.py def MakeFilling(theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter): - """ - * Create a filling from the given compound of contours. - * \param theShape the compound of contours - * \param theMinDeg a minimal degree - * \param theMaxDeg a maximal degree - * \param theTol2D a 2d tolerance - * \param theTol3D a 3d tolerance - * \param theNbIter a number of iteration - * \return New GEOM_Object, containing the created filling surface. - - * Example: see GEOM_TestAll.py - """ anObj = PrimOp.MakeFilling(theShape, theMinDeg, theMaxDeg, theTol2D, theTol3D, theNbIter) if PrimOp.IsDone() == 0: print "MakeFilling : ", PrimOp.GetErrorCode() return anObj +## Replace coincident faces in theShape by one face. +# @param theShape Initial shape. +# @param theTolerance Maximum distance between faces, which can be considered as coincident. +# @return New GEOM_Object, containing a copy of theShape without coincident faces. +# +# Example: see GEOM_Spanner.py def MakeGlueFaces(theShape, theTolerance): - """ - * Replace coincident faces in theShape by one face. - * \param theShape Initial shape. - * \param theTolerance Maximum distance between faces, which can be considered as coincident. - * \return New GEOM_Object, containing a copy of theShape without coincident faces. - - * Example: see GEOM_Spanner.py - """ anObj = ShapesOp.MakeGlueFaces(theShape, theTolerance) if ShapesOp.IsDone() == 0: print "MakeGlueFaces : ", ShapesOp.GetErrorCode() @@ -1368,71 +1257,59 @@ def MakeGlueFaces(theShape, theTolerance): # Boolean (Common, Cut, Fuse, Section) # ----------------------------------------------------------------------------- +## Perform one of boolean operations on two given shapes. +# @param theShape1 First argument for boolean operation. +# @param theShape2 Second argument for boolean operation. +# @param theOperation Indicates the operation to be done: +# 1 - Common, 2 - Cut, 3 - Fuse, 4 - Section. +# @return New GEOM_Object, containing the result shape. +# +# Example: see GEOM_TestAll.py def MakeBoolean(theShape1, theShape2, theOperation): - """ - * Perform one of boolean operations on two given shapes. - * \param theShape1 First argument for boolean operation. - * \param theShape2 Second argument for boolean operation. - * \param theOperation Indicates the operation to be done: - * 1 - Common, 2 - Cut, 3 - Fuse, 4 - Section. - * \return New GEOM_Object, containing the result shape. - - * Example: see GEOM_TestAll.py - """ anObj = BoolOp.MakeBoolean(theShape1, theShape2, theOperation) if BoolOp.IsDone() == 0: print "MakeBoolean : ", BoolOp.GetErrorCode() return anObj +## Shortcut to MakeBoolean(s1, s2, 1) +# +# Example: see GEOM_TestOthers.py def MakeCommon(s1, s2): - """ - * Shortcut to MakeBoolean(s1, s2, 1) - - * Example: see GEOM_TestOthers.py - """ return MakeBoolean(s1, s2, 1) +## Shortcut to MakeBoolean(s1, s2, 2) +# +# Example: see GEOM_TestOthers.py def MakeCut(s1, s2): - """ - * Shortcut to MakeBoolean(s1, s2, 2) - - * Example: see GEOM_TestOthers.py - """ return MakeBoolean(s1, s2, 2) +## Shortcut to MakeBoolean(s1, s2, 3) +# +# Example: see GEOM_TestOthers.py def MakeFuse(s1, s2): - """ - * Shortcut to MakeBoolean(s1, s2, 3) - - * Example: see GEOM_TestOthers.py - """ return MakeBoolean(s1, s2, 3) +## Shortcut to MakeBoolean(s1, s2, 4) +# +# Example: see GEOM_TestOthers.py def MakeSection(s1, s2): - """ - * Shortcut to MakeBoolean(s1, s2, 4) - - * Example: see GEOM_TestOthers.py - """ return MakeBoolean(s1, s2, 4) +## Perform partition operation. +# @param ListShapes Shapes to be intersected. +# @param ListTools Shapes to intersect theShapes. +# @param ListKeepInside Shapes, outside which the results will be deleted. +# Each shape from theKeepInside must belong to theShapes also. +# @param ListRemoveInside Shapes, inside which the results will be deleted. +# Each shape from theRemoveInside must belong to theShapes also. +# @param Limit Type of resulting shapes (corresponding to TopAbs_ShapeEnum). +# @param RemoveWebs If TRUE, perform Glue 3D algorithm. +# @param ListMaterials Material indices for each shape. Make sence, only if theRemoveWebs is TRUE. +# @return New GEOM_Object, containing the result shapes. +# +# Example: see GEOM_TestAll.py def MakePartition(ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[], Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[]): - """ - * Perform partition operation. - * \param ListShapes Shapes to be intersected. - * \param ListTools Shapes to intersect theShapes. - * \param ListKeepInside Shapes, outside which the results will be deleted. - * Each shape from theKeepInside must belong to theShapes also. - * \param ListRemoveInside Shapes, inside which the results will be deleted. - * Each shape from theRemoveInside must belong to theShapes also. - * \param Limit Type of resulting shapes (corresponding to TopAbs_ShapeEnum). - * \param RemoveWebs If TRUE, perform Glue 3D algorithm. - * \param ListMaterials Material indices for each shape. Make sence, only if theRemoveWebs is TRUE. - * \return New GEOM_Object, containing the result shapes. - - * Example: see GEOM_TestAll.py - """ anObj = BoolOp.MakePartition(ListShapes, ListTools, ListKeepInside, ListRemoveInside, Limit, RemoveWebs, ListMaterials); @@ -1440,27 +1317,23 @@ def MakePartition(ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside= print "MakePartition : ", BoolOp.GetErrorCode() return anObj +## Shortcut to MakePartition() +# +# Example: see GEOM_TestOthers.py def Partition(ListShapes, ListTools=[], ListKeepInside=[], ListRemoveInside=[], Limit=ShapeType["SHAPE"], RemoveWebs=0, ListMaterials=[]): - """ - * Shortcut to MakePartition() - - * Example: see GEOM_TestOthers.py - """ anObj = MakePartition(ListShapes, ListTools, ListKeepInside, ListRemoveInside, Limit, RemoveWebs, ListMaterials); return anObj +## Perform partition of the Shape with the Plane +# @param theShape Shape to be intersected. +# @param thePlane Tool shape, to intersect theShape. +# @return New GEOM_Object, containing the result shape. +# +# Example: see GEOM_TestAll.py def MakeHalfPartition(theShape, thePlane): - """ - * Perform partition of the Shape with the Plane - * \param theShape Shape to be intersected. - * \param thePlane Tool shape, to intersect theShape. - * \return New GEOM_Object, containing the result shape. - - * Example: see GEOM_TestAll.py - """ anObj = BoolOp.MakeHalfPartition(theShape, thePlane) if BoolOp.IsDone() == 0: print "MakeHalfPartition : ", BoolOp.GetErrorCode() @@ -1470,149 +1343,129 @@ def MakeHalfPartition(theShape, thePlane): # Transform objects # ----------------------------------------------------------------------------- +## Translate the given object along the vector, specified +# by its end points, creating its copy before the translation. +# @param theObject The object to be translated. +# @param thePoint1 Start point of translation vector. +# @param thePoint2 End point of translation vector. +# @return New GEOM_Object, containing the translated object. +# +# Example: see GEOM_TestAll.py def MakeTranslationTwoPoints(theObject, thePoint1, thePoint2): - """ - * Translate the given object along the vector, specified - * by its end points, creating its copy before the translation. - * \param theObject The object to be translated. - * \param thePoint1 Start point of translation vector. - * \param thePoint2 End point of translation vector. - * \return New GEOM_Object, containing the translated object. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.TranslateTwoPointsCopy(theObject, thePoint1, thePoint2) if TrsfOp.IsDone() == 0: print "TranslateTwoPointsCopy : ", TrsfOp.GetErrorCode() return anObj +## Translate the given object along the vector, specified +# by its components, creating its copy before the translation. +# @param theObject The object to be translated. +# @param theDX,theDY,theDZ Components of translation vector. +# @return New GEOM_Object, containing the translated object. +# +# Example: see GEOM_TestAll.py def MakeTranslation(theObject, theDX, theDY, theDZ): - """ - * Translate the given object along the vector, specified - * by its components, creating its copy before the translation. - * \param theObject The object to be translated. - * \param theDX,theDY,theDZ Components of translation vector. - * \return New GEOM_Object, containing the translated object. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.TranslateDXDYDZCopy(theObject, theDX, theDY, theDZ) if TrsfOp.IsDone() == 0: print "TranslateDXDYDZCopy : ", TrsfOp.GetErrorCode() return anObj +## Translate the given object along the given vector, +# creating its copy before the translation. +# @param theObject The object to be translated. +# @param theVector The translation vector. +# @return New GEOM_Object, containing the translated object. +# +# Example: see GEOM_TestAll.py def MakeTranslationVector(theObject, theVector): - """ - * Translate the given object along the given vector, - * creating its copy before the translation. - * \param theObject The object to be translated. - * \param theVector The translation vector. - * \return New GEOM_Object, containing the translated object. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.TranslateVectorCopy(theObject, theVector) if TrsfOp.IsDone() == 0: print "TranslateVectorCopy : ", TrsfOp.GetErrorCode() return anObj +## Rotate the given object around the given axis +# on the given angle, creating its copy before the rotatation. +# @param theObject The object to be rotated. +# @param theAxis Rotation axis. +# @param theAngle Rotation angle in radians. +# @return New GEOM_Object, containing the rotated object. +# +# Example: see GEOM_TestAll.py def MakeRotation(theObject, theAxis, theAngle): - """ - * Rotate the given object around the given axis - * on the given angle, creating its copy before the rotatation. - * \param theObject The object to be rotated. - * \param theAxis Rotation axis. - * \param theAngle Rotation angle in radians. - * \return New GEOM_Object, containing the rotated object. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.RotateCopy(theObject, theAxis, theAngle) if TrsfOp.IsDone() == 0: print "RotateCopy : ", TrsfOp.GetErrorCode() return anObj +## Scale the given object by the factor, creating its copy before the scaling. +# @param theObject The object to be scaled. +# @param thePoint Center point for scaling. +# @param theFactor Scaling factor value. +# @return New GEOM_Object, containing the scaled shape. +# +# Example: see GEOM_TestAll.py def MakeScaleTransform(theObject, thePoint, theFactor): - """ - * Scale the given object by the factor, creating its copy before the scaling. - * \param theObject The object to be scaled. - * \param thePoint Center point for scaling. - * \param theFactor Scaling factor value. - * \return New GEOM_Object, containing the scaled shape. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.ScaleShapeCopy(theObject, thePoint, theFactor) if TrsfOp.IsDone() == 0: print "ScaleShapeCopy : ", TrsfOp.GetErrorCode() return anObj +## Create an object, symmetrical +# to the given one relatively the given plane. +# @param theObject The object to be mirrored. +# @param thePlane Plane of symmetry. +# @return New GEOM_Object, containing the mirrored shape. +# +# Example: see GEOM_TestAll.py def MakeMirrorByPlane(theObject, thePlane): - """ - * Create an object, symmetrical - * to the given one relatively the given plane. - * \param theObject The object to be mirrored. - * \param thePlane Plane of symmetry. - * \return New GEOM_Object, containing the mirrored shape. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.MirrorPlaneCopy(theObject, thePlane) if TrsfOp.IsDone() == 0: print "MirrorPlaneCopy : ", TrsfOp.GetErrorCode() return anObj +## Create an object, symmetrical +# to the given one relatively the given axis. +# @param theObject The object to be mirrored. +# @param theAxis Axis of symmetry. +# @return New GEOM_Object, containing the mirrored shape. +# +# Example: see GEOM_TestAll.py def MakeMirrorByAxis(theObject, theAxis): - """ - * Create an object, symmetrical - * to the given one relatively the given axis. - * \param theObject The object to be mirrored. - * \param theAxis Axis of symmetry. - * \return New GEOM_Object, containing the mirrored shape. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.MirrorAxisCopy(theObject, theAxis) if TrsfOp.IsDone() == 0: print "MirrorAxisCopy : ", TrsfOp.GetErrorCode() return anObj +## Create an object, symmetrical +# to the given one relatively the given point. +# @param theObject The object to be mirrored. +# @param thePoint Point of symmetry. +# @return New GEOM_Object, containing the mirrored shape. +# +# Example: see GEOM_TestAll.py def MakeMirrorByPoint(theObject, thePoint): - """ - * Create an object, symmetrical - * to the given one relatively the given point. - * \param theObject The object to be mirrored. - * \param thePoint Point of symmetry. - * \return New GEOM_Object, containing the mirrored shape. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.MirrorPointCopy(theObject, thePoint) if TrsfOp.IsDone() == 0: print "MirrorPointCopy : ", TrsfOp.GetErrorCode() return anObj +## Modify the Location of the given object by LCS +# creating its copy before the setting +# +# Example: see GEOM_TestAll.py def MakePosition(theObject, theStartLCS, theEndLCS): - """ - * Modify the Location of the given object by LCS - * creating its copy before the setting - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.PositionShapeCopy(theObject, theStartLCS, theEndLCS) if TrsfOp.IsDone() == 0: print "PositionShapeCopy : ", TrsfOp.GetErrorCode() return anObj +## Create new object as offset of the given one. +# @param theObject The base object for the offset. +# @param theOffset Offset value. +# @return New GEOM_Object, containing the offset object. +# +# Example: see GEOM_TestAll.py def MakeOffset(theObject, theOffset): - """ - * Create new object as offset of the given one. - * \param theObject The base object for the offset. - * \param theOffset Offset value. - * \return New GEOM_Object, containing the offset object. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.OffsetShapeCopy(theObject, theOffset) if TrsfOp.IsDone() == 0: print "OffsetShapeCopy : ", TrsfOp.GetErrorCode() @@ -1622,101 +1475,89 @@ def MakeOffset(theObject, theOffset): # Patterns # ----------------------------------------------------------------------------- +## Translate the given object along the given vector a given number times +# @param theObject The object to be translated. +# @param theVector Direction of the translation. +# @param theStep Distance to translate on. +# @param theNbTimes Quantity of translations to be done. +# @return New GEOM_Object, containing compound of all +# the shapes, obtained after each translation. +# +# Example: see GEOM_TestAll.py def MakeMultiTranslation1D(theObject, theVector, theStep, theNbTimes): - """ - * Translate the given object along the given vector a given number times - * \param theObject The object to be translated. - * \param theVector Direction of the translation. - * \param theStep Distance to translate on. - * \param theNbTimes Quantity of translations to be done. - * \return New GEOM_Object, containing compound of all - * the shapes, obtained after each translation. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.MultiTranslate1D(theObject, theVector, theStep, theNbTimes) if TrsfOp.IsDone() == 0: print "MultiTranslate1D : ", TrsfOp.GetErrorCode() return anObj +## Conseqently apply two specified translations to theObject specified number of times. +# @param theObject The object to be translated. +# @param theVector1 Direction of the first translation. +# @param theStep1 Step of the first translation. +# @param theNbTimes1 Quantity of translations to be done along theVector1. +# @param theVector2 Direction of the second translation. +# @param theStep2 Step of the second translation. +# @param theNbTimes2 Quantity of translations to be done along theVector2. +# @return New GEOM_Object, containing compound of all +# the shapes, obtained after each translation. +# +# Example: see GEOM_TestAll.py def MakeMultiTranslation2D(theObject, theVector1, theStep1, theNbTimes1, theVector2, theStep2, theNbTimes2): - """ - * Conseqently apply two specified translations to theObject specified number of times. - * \param theObject The object to be translated. - * \param theVector1 Direction of the first translation. - * \param theStep1 Step of the first translation. - * \param theNbTimes1 Quantity of translations to be done along theVector1. - * \param theVector2 Direction of the second translation. - * \param theStep2 Step of the second translation. - * \param theNbTimes2 Quantity of translations to be done along theVector2. - * \return New GEOM_Object, containing compound of all - * the shapes, obtained after each translation. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.MultiTranslate2D(theObject, theVector1, theStep1, theNbTimes1, theVector2, theStep2, theNbTimes2) if TrsfOp.IsDone() == 0: print "MultiTranslate2D : ", TrsfOp.GetErrorCode() return anObj +## Rotate the given object around the given axis a given number times. +# Rotation angle will be 2*PI/theNbTimes. +# @param theObject The object to be rotated. +# @param theAxis The rotation axis. +# @param theNbTimes Quantity of rotations to be done. +# @return New GEOM_Object, containing compound of all the +# shapes, obtained after each rotation. +# +# Example: see GEOM_TestAll.py def MultiRotate1D(theObject, theAxis, theNbTimes): - """ - * Rotate the given object around the given axis a given number times. - * Rotation angle will be 2*PI/theNbTimes. - * \param theObject The object to be rotated. - * \param theAxis The rotation axis. - * \param theNbTimes Quantity of rotations to be done. - * \return New GEOM_Object, containing compound of all the - * shapes, obtained after each rotation. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.MultiRotate1D(theObject, theAxis, theNbTimes) if TrsfOp.IsDone() == 0: print "MultiRotate1D : ", TrsfOp.GetErrorCode() return anObj +## Rotate the given object around the +# given axis on the given angle a given number +# times and multi-translate each rotation result. +# Translation direction passes through center of gravity +# of rotated shape and its projection on the rotation axis. +# @param theObject The object to be rotated. +# @param theAxis Rotation axis. +# @param theAngle Rotation angle in graduces. +# @param theNbTimes1 Quantity of rotations to be done. +# @param theStep Translation distance. +# @param theNbTimes2 Quantity of translations to be done. +# @return New GEOM_Object, containing compound of all the +# shapes, obtained after each transformation. +# +# Example: see GEOM_TestAll.py def MultiRotate2D(theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2): - """ - * Rotate the given object around the - * given axis on the given angle a given number - * times and multi-translate each rotation result. - * Translation direction passes through center of gravity - * of rotated shape and its projection on the rotation axis. - * \param theObject The object to be rotated. - * \param theAxis Rotation axis. - * \param theAngle Rotation angle in graduces. - * \param theNbTimes1 Quantity of rotations to be done. - * \param theStep Translation distance. - * \param theNbTimes2 Quantity of translations to be done. - * \return New GEOM_Object, containing compound of all the - * shapes, obtained after each transformation. - - * Example: see GEOM_TestAll.py - """ anObj = TrsfOp.MultiRotate2D(theObject, theAxis, theAngle, theNbTimes1, theStep, theNbTimes2) if TrsfOp.IsDone() == 0: print "MultiRotate2D : ", TrsfOp.GetErrorCode() return anObj +## The same, as MultiRotate1D(), but axis is given by direction and point +# +# Example: see GEOM_TestOthers.py def MakeMultiRotation1D(aShape,aDir,aPoint,aNbTimes): - """ - * The same, as MultiRotate1D(), but axis is given by direction and point - - * Example: see GEOM_TestOthers.py - """ aVec = MakeLine(aPoint,aDir) anObj = MultiRotate1D(aShape,aVec,aNbTimes) return anObj +## The same, as MultiRotate2D(), but axis is given by direction and point +# +# Example: see GEOM_TestOthers.py def MakeMultiRotation2D(aShape,aDir,aPoint,anAngle,nbtimes1,aStep,nbtimes2): - """ - * The same, as MultiRotate2D(), but axis is given by direction and point - - * Example: see GEOM_TestOthers.py - """ aVec = MakeLine(aPoint,aDir) anObj = MultiRotate2D(aShape,aVec,anAngle,nbtimes1,aStep,nbtimes2) return anObj @@ -1725,32 +1566,28 @@ def MakeMultiRotation2D(aShape,aDir,aPoint,anAngle,nbtimes1,aStep,nbtimes2): # Local operations # ----------------------------------------------------------------------------- +## Perform a fillet on all edges of the given shape. +# @param theShape Shape, to perform fillet on. +# @param theR Fillet radius. +# @return New GEOM_Object, containing the result shape. +# +# Example: see GEOM_TestOthers.py def MakeFilletAll(theShape, theR): - """ - * Perform a fillet on all edges of the given shape. - * \param theShape Shape, to perform fillet on. - * \param theR Fillet radius. - * \return New GEOM_Object, containing the result shape. - - * Example: see GEOM_TestOthers.py - """ anObj = LocalOp.MakeFilletAll(theShape, theR) if LocalOp.IsDone() == 0: print "MakeFilletAll : ", LocalOp.GetErrorCode() return anObj +## Perform a fillet on the specified edges/faces of the given shape +# @param theShape Shape, to perform fillet on. +# @param theR Fillet radius. +# @param theShapeType Type of shapes in . +# @param theListShapes Global indices of edges/faces to perform fillet on. +# \note Global index of sub-shape can be obtained, using method geompy.GetSubShapeID(). +# @return New GEOM_Object, containing the result shape. +# +# Example: see GEOM_TestAll.py def MakeFillet(theShape, theR, theShapeType, theListShapes): - """ - * Perform a fillet on the specified edges/faces of the given shape - * \param theShape Shape, to perform fillet on. - * \param theR Fillet radius. - * \param theShapeType Type of shapes in . - * \param theListShapes Global indices of edges/faces to perform fillet on. - * \note Global index of sub-shape can be obtained, using method geompy.GetSubShapeID(). - * \return New GEOM_Object, containing the result shape. - - * Example: see GEOM_TestAll.py - """ anObj = None if theShapeType == ShapeType["EDGE"]: anObj = LocalOp.MakeFilletEdges(theShape, theR, theListShapes) @@ -1760,64 +1597,56 @@ def MakeFillet(theShape, theR, theShapeType, theListShapes): print "MakeFillet : ", LocalOp.GetErrorCode() return anObj +## Perform a symmetric chamfer on all edges of the given shape. +# @param theShape Shape, to perform chamfer on. +# @param theD Chamfer size along each face. +# @return New GEOM_Object, containing the result shape. +# +# Example: see GEOM_TestOthers.py def MakeChamferAll(theShape, theD): - """ - * Perform a symmetric chamfer on all edges of the given shape. - * \param theShape Shape, to perform chamfer on. - * \param theD Chamfer size along each face. - * \return New GEOM_Object, containing the result shape. - - * Example: see GEOM_TestOthers.py - """ anObj = LocalOp.MakeChamferAll(theShape, theD) if LocalOp.IsDone() == 0: print "MakeChamferAll : ", LocalOp.GetErrorCode() return anObj +## 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 \a theFace1. +# @param theD2 Chamfer size along \a theFace2. +# @param theFace1,theFace2 Global indices of two faces of \a theShape. +# \note Global index of sub-shape can be obtained, using method geompy.GetSubShapeID(). +# @return New GEOM_Object, containing the result shape. +# +# Example: see GEOM_TestAll.py def MakeChamferEdge(theShape, theD1, theD2, theFace1, theFace2): - """ - * 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 \a theFace1. - * \param theD2 Chamfer size along \a theFace2. - * \param theFace1,theFace2 Global indices of two faces of \a theShape. - * \note Global index of sub-shape can be obtained, using method geompy.GetSubShapeID(). - * \return New GEOM_Object, containing the result shape. - - * Example: see GEOM_TestAll.py - """ anObj = LocalOp.MakeChamferEdge(theShape, theD1, theD2, theFace1, theFace2) if LocalOp.IsDone() == 0: print "MakeChamferEdge : ", LocalOp.GetErrorCode() return anObj +## 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 \a theFaces. If both faces, +# connected to the edge, are in \a theFaces, \a theD1 +# 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 \a theShape. +# \note Global index of sub-shape can be obtained, using method geompy.GetSubShapeID(). +# @return New GEOM_Object, containing the result shape. +# +# Example: see GEOM_TestAll.py def MakeChamferFaces(theShape, theD1, theD2, theFaces): - """ - * 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 \a theFaces. If both faces, - * connected to the edge, are in \a theFaces, \a theD1 - * 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 \a theShape. - * \note Global index of sub-shape can be obtained, using method geompy.GetSubShapeID(). - * \return New GEOM_Object, containing the result shape. - - * Example: see GEOM_TestAll.py - """ anObj = LocalOp.MakeChamferFaces(theShape, theD1, theD2, theFaces) if LocalOp.IsDone() == 0: print "MakeChamferFaces : ", LocalOp.GetErrorCode() return anObj +## Shortcut to MakeChamferEdge() and MakeChamferFaces() +# +# Example: see GEOM_TestOthers.py def MakeChamfer(aShape,d1,d2,aShapeType,ListShape): - """ - * Shortcut to MakeChamferEdge() and MakeChamferFaces() - - * Example: see GEOM_TestOthers.py - """ anObj = None if aShapeType == ShapeType["EDGE"]: anObj = MakeChamferEdge(aShape,d1,d2,ListShape[0],ListShape[1]) @@ -1825,19 +1654,17 @@ def MakeChamfer(aShape,d1,d2,aShapeType,ListShape): anObj = MakeChamferFaces(aShape,d1,d2,ListShape) return anObj +## Perform an Archimde operation on the given shape with given parameters. +# The object presenting the resulting face is returned. +# @param theShape Shape to be put in water. +# @param theWeight Weight og the shape. +# @param theWaterDensity Density of the water. +# @param theMeshDeflection Deflection of the mesh, using to compute the section. +# @return New GEOM_Object, containing a section of \a theShape +# by a plane, corresponding to water level. +# +# Example: see GEOM_TestAll.py def Archimede(theShape, theWeight, theWaterDensity, theMeshDeflection): - """ - * Perform an Archimde operation on the given shape with given parameters. - * The object presenting the resulting face is returned - * \param theShape Shape to be put in water. - * \param theWeight Weight og the shape. - * \param theWaterDensity Density of the water. - * \param theMeshDeflection Deflection of the mesh, using to compute the section. - * \return New GEOM_Object, containing a section of \a theShape - * by a plane, corresponding to water level. - - * Example: see GEOM_TestAll.py - """ anObj = LocalOp.MakeArchimede(theShape, theWeight, theWaterDensity, theMeshDeflection) if LocalOp.IsDone() == 0: print "MakeArchimede : ", LocalOp.GetErrorCode() @@ -1847,130 +1674,112 @@ def Archimede(theShape, theWeight, theWaterDensity, theMeshDeflection): # Information objects # ----------------------------------------------------------------------------- +## Get point coordinates +# @return [x, y, z] +# +# Example: see GEOM_TestMeasures.py def PointCoordinates(Point): - """ - * Get point coordinates - * \return [x, y, z] - - * Example: see GEOM_TestMeasures.py - """ aTuple = MeasuOp.PointCoordinates(Point) if MeasuOp.IsDone() == 0: print "PointCoordinates : ", MeasuOp.GetErrorCode() return aTuple +## Get summarized length of all wires, +# area of surface and volume of the given shape. +# @param theShape Shape to define properties of. +# @return [theLength, theSurfArea, theVolume] +# theLength: Summarized length of all wires of the given shape. +# theSurfArea: Area of surface of the given shape. +# theVolume: Volume of the given shape. +# +# Example: see GEOM_TestMeasures.py def BasicProperties(theShape): - """ - * Get summarized length of all wires, - * area of surface and volume of the given shape. - * \param theShape Shape to define properties of. - * \return [theLength, theSurfArea, theVolume] - * theLength: Summarized length of all wires of the given shape. - * theSurfArea: Area of surface of the given shape. - * theVolume: Volume of the given shape. - - * Example: see GEOM_TestMeasures.py - """ aTuple = MeasuOp.GetBasicProperties(theShape) if MeasuOp.IsDone() == 0: print "BasicProperties : ", MeasuOp.GetErrorCode() return aTuple +## Get parameters of bounding box of the given shape +# @param theShape Shape to obtain bounding box of. +# @return [Xmin,Xmax, Ymin,Ymax, Zmin,Zmax] +# Xmin,Xmax: Limits of shape along OX axis. +# Ymin,Ymax: Limits of shape along OY axis. +# Zmin,Zmax: Limits of shape along OZ axis. +# +# Example: see GEOM_TestMeasures.py def BoundingBox(theShape): - """ - * Get parameters of bounding box of the given shape - * \param theShape Shape to obtain bounding box of. - * \return [Xmin,Xmax, Ymin,Ymax, Zmin,Zmax] - * Xmin,Xmax: Limits of shape along OX axis. - * Ymin,Ymax: Limits of shape along OY axis. - * Zmin,Zmax: Limits of shape along OZ axis. - - * Example: see GEOM_TestMeasures.py - """ aTuple = MeasuOp.GetBoundingBox(theShape) if MeasuOp.IsDone() == 0: print "BoundingBox : ", MeasuOp.GetErrorCode() return aTuple +## Get inertia matrix and moments of inertia of theShape. +# @param theShape Shape to calculate inertia of. +# @return [I11,I12,I13, I21,I22,I23, I31,I32,I33, Ix,Iy,Iz] +# I(1-3)(1-3): Components of the inertia matrix of the given shape. +# Ix,Iy,Iz: Moments of inertia of the given shape. +# +# Example: see GEOM_TestMeasures.py def Inertia(theShape): - """ - * Get inertia matrix and moments of inertia of theShape. - * \param theShape Shape to calculate inertia of. - * \return [I11,I12,I13, I21,I22,I23, I31,I32,I33, Ix,Iy,Iz] - * I(1-3)(1-3): Components of the inertia matrix of the given shape. - * Ix,Iy,Iz: Moments of inertia of the given shape. - - * Example: see GEOM_TestMeasures.py - """ aTuple = MeasuOp.GetInertia(theShape) if MeasuOp.IsDone() == 0: print "Inertia : ", MeasuOp.GetErrorCode() return aTuple +## Get minimal distance between the given shapes. +# @param theShape1,theShape2 Shapes to find minimal distance between. +# @return Value of the minimal distance between the given shapes. +# +# Example: see GEOM_TestMeasures.py def MinDistance(theShape1, theShape2): - """ - * Get minimal distance between the given shapes. - * \param theShape1,theShape2 Shapes to find minimal distance between. - * \return Value of the minimal distance between the given shapes. - - * Example: see GEOM_TestMeasures.py - """ aTuple = MeasuOp.GetMinDistance(theShape1, theShape2) if MeasuOp.IsDone() == 0: print "MinDistance : ", MeasuOp.GetErrorCode() return aTuple[0] +## Get min and max tolerances of sub-shapes of theShape +# @param theShape Shape, to get tolerances of. +# @return [FaceMin,FaceMax, EdgeMin,EdgeMax, VertMin,VertMax] +# FaceMin,FaceMax: Min and max tolerances of the faces. +# EdgeMin,EdgeMax: Min and max tolerances of the edges. +# VertMin,VertMax: Min and max tolerances of the vertices. +# +# Example: see GEOM_TestMeasures.py def Tolerance(theShape): - """ - * Get min and max tolerances of sub-shapes of theShape - * \param theShape Shape, to get tolerances of. - * \return [FaceMin,FaceMax, EdgeMin,EdgeMax, VertMin,VertMax] - * FaceMin,FaceMax: Min and max tolerances of the faces. - * EdgeMin,EdgeMax: Min and max tolerances of the edges. - * VertMin,VertMax: Min and max tolerances of the vertices. - - * Example: see GEOM_TestMeasures.py - """ aTuple = MeasuOp.GetTolerance(theShape) if MeasuOp.IsDone() == 0: print "Tolerance : ", MeasuOp.GetErrorCode() return aTuple +## Obtain description of the given shape (number of sub-shapes of each type) +# @param theShape Shape to be described. +# @return Description of the given shape. +# +# Example: see GEOM_TestMeasures.py def WhatIs(theShape): - """ - * Obtain description of the given shape (number of sub-shapes of each type) - * \param theShape Shape to be described. - * \return Description of the given shape. - - * Example: see GEOM_TestMeasures.py - """ aDescr = MeasuOp.WhatIs(theShape) if MeasuOp.IsDone() == 0: print "WhatIs : ", MeasuOp.GetErrorCode() return aDescr +## Get a point, situated at the centre of mass of theShape. +# @param theShape Shape to define centre of mass of. +# @return New GEOM_Object, containing the created point. +# +# Example: see GEOM_TestMeasures.py def MakeCDG(theShape): - """ - * Get a point, situated at the centre of mass of theShape. - * \param theShape Shape to define centre of mass of. - * \return New GEOM_Object, containing the created point. - - * Example: see GEOM_TestMeasures.py - """ anObj = MeasuOp.GetCentreOfMass(theShape) if MeasuOp.IsDone() == 0: print "GetCentreOfMass : ", MeasuOp.GetErrorCode() return anObj +## Check a topology of the given shape. +# @param theShape Shape to check validity of. +# @return TRUE, if the shape "seems to be valid" from the topological point of view. +# If theShape is invalid, prints a description of problem. +# +# Example: see GEOM_TestMeasures.py def CheckShape(theShape): - """ - * Check a topology of the given shape. - * \param theShape Shape to check validity of. - * \return TRUE, if the shape "seems to be valid" from the topological point of view. - * If theShape is invalid, prints a description of problem. - - * Example: see GEOM_TestMeasures.py - """ (IsValid, Status) = MeasuOp.CheckShape(theShape) if MeasuOp.IsDone() == 0: print "CheckShape : ", MeasuOp.GetErrorCode() @@ -1983,287 +1792,243 @@ def CheckShape(theShape): # Import/Export objects # ----------------------------------------------------------------------------- +## Import a shape from the BREP or IGES or STEP file +# (depends on given format) with given name. +# @param theFileName The file, containing the shape. +# @param theFormatName Specify format for the file reading. +# Available formats can be obtained with InsertOp.ImportTranslators() method. +# @return New GEOM_Object, containing the imported shape. +# +# Example: see GEOM_TestOthers.py def Import(theFileName, theFormatName): - """ - * Import a shape from the BREP or IGES or STEP file - * (depends on given format) with given name. - * \param theFileName The file, containing the shape. - * \param theFormatName Specify format for the file reading. - * Available formats can be obtained with InsertOp.ImportTranslators() method. - * \return New GEOM_Object, containing the imported shape. - - * Example: see GEOM_TestOthers.py - """ anObj = InsertOp.Import(theFileName, theFormatName) if InsertOp.IsDone() == 0: print "Import : ", InsertOp.GetErrorCode() return anObj +## Shortcut to Import() for BREP format +# +# Example: see GEOM_TestOthers.py def ImportBREP(theFileName): - """ - * Shortcut to Import() for BREP format - - * Example: see GEOM_TestOthers.py - """ return Import(theFileName, "BREP") +## Shortcut to Import() for IGES format +# +# Example: see GEOM_TestOthers.py def ImportIGES(theFileName): - """ - * Shortcut to Import() for IGES format - - * Example: see GEOM_TestOthers.py - """ return Import(theFileName, "IGES") +## Shortcut to Import() for STEP format +# +# Example: see GEOM_TestOthers.py def ImportSTEP(theFileName): - """ - * Shortcut to Import() for STEP format - - * Example: see GEOM_TestOthers.py - """ return Import(theFileName, "STEP") +## Export the given shape into a file with given name. +# @param theObject Shape to be stored in the file. +# @param theFileName Name of the file to store the given shape in. +# @param theFormatName Specify format for the shape storage. +# Available formats can be obtained with InsertOp.ImportTranslators() method. +# +# Example: see GEOM_TestOthers.py def Export(theObject, theFileName, theFormatName): - """ - * Export the given shape into a file with given name. - * \param theObject Shape to be stored in the file. - * \param theFileName Name of the file to store the given shape in. - * \param theFormatName Specify format for the shape storage. - * Available formats can be obtained with InsertOp.ImportTranslators() method. - - * Example: see GEOM_TestOthers.py - """ InsertOp.Export(theObject, theFileName, theFormatName) if InsertOp.IsDone() == 0: print "Export : ", InsertOp.GetErrorCode() +## Shortcut to Export() for BREP format +# +# Example: see GEOM_TestOthers.py def ExportBREP(theObject, theFileName): - """ - * Shortcut to Export() for BREP format - - * Example: see GEOM_TestOthers.py - """ return Export(theObject, theFileName, "BREP") +## Shortcut to Export() for IGES format +# +# Example: see GEOM_TestOthers.py def ExportIGES(theObject, theFileName): - """ - * Shortcut to Export() for IGES format - - * Example: see GEOM_TestOthers.py - """ return Export(theObject, theFileName, "IGES") +## Shortcut to Export() for STEP format +# +# Example: see GEOM_TestOthers.py def ExportSTEP(theObject, theFileName): - """ - * Shortcut to Export() for STEP format - - * Example: see GEOM_TestOthers.py - """ return Export(theObject, theFileName, "STEP") # ----------------------------------------------------------------------------- # Block operations # ----------------------------------------------------------------------------- +## Create a quadrangle face from four edges. Order of Edges is not +# important. It is not necessary that edges share the same vertex. +# @param E1,E2,E3,E4 Edges for the face bound. +# @return New GEOM_Object, containing the created face. +# +# Example: see GEOM_Spanner.py def MakeQuad(E1, E2, E3, E4): - """ - * Create a quadrangle face from four edges. Order of Edges is not - * important. It is not necessary that edges share the same vertex. - * \param E1,E2,E3,E4 Edges for the face bound. - * \return New GEOM_Object, containing the created face. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.MakeQuad(E1, E2, E3, E4) if BlocksOp.IsDone() == 0: print "MakeQuad : ", BlocksOp.GetErrorCode() return anObj +## Create a quadrangle face on two edges. +# The missing edges will be built by creating the shortest ones. +# @param E1,E2 Two opposite edges for the face. +# @return New GEOM_Object, containing the created face. +# +# Example: see GEOM_Spanner.py def MakeQuad2Edges(E1, E2): - """ - * Create a quadrangle face on two edges. - * The missing edges will be built by creating the shortest ones. - * \param E1,E2 Two opposite edges for the face. - * \return New GEOM_Object, containing the created face. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.MakeQuad2Edges(E1, E2) if BlocksOp.IsDone() == 0: print "MakeQuad2Edges : ", BlocksOp.GetErrorCode() return anObj +## Create a quadrangle face with specified corners. +# The missing edges will be built by creating the shortest ones. +# @param V1,V2,V3,V4 Corner vertices for the face. +# @return New GEOM_Object, containing the created face. +# +# Example: see GEOM_Spanner.py def MakeQuad4Vertices(V1, V2, V3, V4): - """ - * Create a quadrangle face with specified corners. - * The missing edges will be built by creating the shortest ones. - * \param V1,V2,V3,V4 Corner vertices for the face. - * \return New GEOM_Object, containing the created face. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.MakeQuad4Vertices(V1, V2, V3, V4) if BlocksOp.IsDone() == 0: print "MakeQuad4Vertices : ", BlocksOp.GetErrorCode() return anObj +## Create a hexahedral solid, bounded by the six given faces. Order of +# faces is not important. It is not necessary that Faces share the same edge. +# @param F1,F2,F3,F4,F5,F6 Faces for the hexahedral solid. +# @return New GEOM_Object, containing the created solid. +# +# Example: see GEOM_Spanner.py def MakeHexa(F1, F2, F3, F4, F5, F6): - """ - * Create a hexahedral solid, bounded by the six given faces. Order of - * faces is not important. It is not necessary that Faces share the same edge. - * \param F1,F2,F3,F4,F5,F6 Faces for the hexahedral solid. - * \return New GEOM_Object, containing the created solid. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.MakeHexa(F1, F2, F3, F4, F5, F6) if BlocksOp.IsDone() == 0: print "MakeHexa : ", BlocksOp.GetErrorCode() return anObj +## Create a hexahedral solid between two given faces. +# The missing faces will be built by creating the smallest ones. +# @param F1,F2 Two opposite faces for the hexahedral solid. +# @return New GEOM_Object, containing the created solid. +# +# Example: see GEOM_Spanner.py def MakeHexa2Faces(F1, F2): - """ - * Create a hexahedral solid between two given faces. - * The missing faces will be built by creating the smallest ones. - * \param F1,F2 Two opposite faces for the hexahedral solid. - * \return New GEOM_Object, containing the created solid. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.MakeHexa2Faces(F1, F2) if BlocksOp.IsDone() == 0: print "MakeHexa2Faces : ", BlocksOp.GetErrorCode() return anObj +## 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. +# +# Example: see GEOM_TestOthers.py def GetPoint(theShape, theX, theY, theZ, theEpsilon): - """ - * 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. - - * Example: see GEOM_TestOthers.py - """ anObj = BlocksOp.GetPoint(theShape, theX, theY, theZ, theEpsilon) if BlocksOp.IsDone() == 0: print "GetPoint : ", BlocksOp.GetErrorCode() return anObj +## Get an edge, found in the given shape by two given vertices. +# @param theShape Block or a compound of blocks. +# @param thePoint1,thePoint2 Points, close to the ends of the desired edge. +# @return New GEOM_Object, containing the found edge. +# +# Example: see GEOM_Spanner.py def GetEdge(theShape, thePoint1, thePoint2): - """ - * Get an edge, found in the given shape by two given vertices. - * \param theShape Block or a compound of blocks. - * \param thePoint1,thePoint2 Points, close to the ends of the desired edge. - * \return New GEOM_Object, containing the found edge. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.GetEdge(theShape, thePoint1, thePoint2) if BlocksOp.IsDone() == 0: print "GetEdge : ", BlocksOp.GetErrorCode() return anObj +## 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. +# +# Example: see GEOM_TestOthers.py def GetEdgeNearPoint(theShape, thePoint): - """ - * 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. - - * Example: see GEOM_TestOthers.py - """ anObj = BlocksOp.GetEdgeNearPoint(theShape, thePoint) if BlocksOp.IsDone() == 0: print "GetEdgeNearPoint : ", BlocksOp.GetErrorCode() return anObj +## Returns a face, found in the given shape by four given corner vertices. +# @param theShape Block or a compound of blocks. +# @param thePoint1-thePoint4 Points, close to the corners of the desired face. +# @return New GEOM_Object, containing the found face. +# +# Example: see GEOM_Spanner.py def GetFaceByPoints(theShape, thePoint1, thePoint2, thePoint3, thePoint4): - """ - * Returns a face, found in the given shape by four given corner vertices. - * \param theShape Block or a compound of blocks. - * \param thePoint1-thePoint4 Points, close to the corners of the desired face. - * \return New GEOM_Object, containing the found face. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.GetFaceByPoints(theShape, thePoint1, thePoint2, thePoint3, thePoint4) if BlocksOp.IsDone() == 0: print "GetFaceByPoints : ", BlocksOp.GetErrorCode() return anObj +## Get a face of block, found in the given shape by two given edges. +# @param theShape Block or a compound of blocks. +# @param theEdge1,theEdge2 Edges, close to the edges of the desired face. +# @return New GEOM_Object, containing the found face. +# +# Example: see GEOM_Spanner.py def GetFaceByEdges(theShape, theEdge1, theEdge2): - """ - * Get a face of block, found in the given shape by two given edges. - * \param theShape Block or a compound of blocks. - * \param theEdge1,theEdge2 Edges, close to the edges of the desired face. - * \return New GEOM_Object, containing the found face. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.GetFaceByEdges(theShape, theEdge1, theEdge2) if BlocksOp.IsDone() == 0: print "GetFaceByEdges : ", BlocksOp.GetErrorCode() return anObj +## Find a face, opposite to the given one in the given block. +# @param theBlock Must be a hexahedral solid. +# @param theFace Face of \a theBlock, opposite to the desired face. +# @return New GEOM_Object, containing the found face. +# +# Example: see GEOM_Spanner.py def GetOppositeFace(theBlock, theFace): - """ - * Find a face, opposite to the given one in the given block. - * \param theBlock Must be a hexahedral solid. - * \param theFace Face of \a theBlock, opposite to the desired face. - * \return New GEOM_Object, containing the found face. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.GetOppositeFace(theBlock, theFace) if BlocksOp.IsDone() == 0: print "GetOppositeFace : ", BlocksOp.GetErrorCode() return anObj +## Find a face 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 face. +# @return New GEOM_Object, containing the found face. +# +# Example: see GEOM_Spanner.py def GetFaceNearPoint(theShape, thePoint): - """ - * Find a face 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 face. - * \return New GEOM_Object, containing the found face. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.GetFaceNearPoint(theShape, thePoint) if BlocksOp.IsDone() == 0: print "GetFaceNearPoint : ", BlocksOp.GetErrorCode() return anObj +## Find a face of block, whose outside normale has minimal angle with the given vector. +# @param theShape Block or a compound of blocks. +# @param theVector Vector, close to the normale of the desired face. +# @return New GEOM_Object, containing the found face. +# +# Example: see GEOM_Spanner.py def GetFaceByNormale(theBlock, theVector): - """ - * Find a face of block, whose outside normale has minimal angle with the given vector. - * \param theShape Block or a compound of blocks. - * \param theVector Vector, close to the normale of the desired face. - * \return New GEOM_Object, containing the found face. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.GetFaceByNormale(theBlock, theVector) if BlocksOp.IsDone() == 0: print "GetFaceByNormale : ", BlocksOp.GetErrorCode() return anObj +## 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. +# If theCompound is not valid, prints all discovered errors. +# +# Example: see GEOM_Spanner.py def CheckCompoundOfBlocks(theCompound): - """ - * 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. - * If theCompound is not valid, prints all discovered errors. - - * Example: see GEOM_Spanner.py - """ (IsValid, BCErrors) = BlocksOp.CheckCompoundOfBlocks(theCompound) if BlocksOp.IsDone() == 0: print "CheckCompoundOfBlocks : ", BlocksOp.GetErrorCode() @@ -2273,141 +2038,123 @@ def CheckCompoundOfBlocks(theCompound): print Descr return IsValid +## Remove all seam and degenerated edges from \a theShape. +# Unite faces and edges, sharing one surface. +# @param theShape The compound or single solid to remove irregular edges from. +# @return Improved shape. +# +# Example: see GEOM_TestOthers.py def RemoveExtraEdges(theShape): - """ - * Remove all seam and degenerated edges from \a theShape. - * Unite faces and edges, sharing one surface. - * \param theShape The compound or single solid to remove irregular edges from. - * \return Improved shape. - - * Example: see GEOM_TestOthers.py - """ anObj = BlocksOp.RemoveExtraEdges(theShape) if BlocksOp.IsDone() == 0: print "RemoveExtraEdges : ", BlocksOp.GetErrorCode() return anObj +## Check, if the given shape is a blocks compound. +# Fix all detected errors. +# \note Single block can be also fixed by this method. +# @param theCompound The compound to check and improve. +# @return Improved compound. +# +# Example: see GEOM_TestOthers.py def CheckAndImprove(theShape): - """ - * Check, if the given shape is a blocks compound. - * Fix all detected errors. - * \note Single block can be also fixed by this method. - * \param theCompound The compound to check and improve. - * \return Improved compound. - - * Example: see GEOM_TestOthers.py - """ anObj = BlocksOp.CheckAndImprove(theShape) if BlocksOp.IsDone() == 0: print "CheckAndImprove : ", BlocksOp.GetErrorCode() return anObj +## Get all the blocks, contained in the given compound. +# @param theCompound The compound to explode. +# @param theMinNbFaces If solid has lower number of faces, it is not a block. +# @param theMaxNbFaces If solid has higher number of faces, it is not a block. +# \note If theMaxNbFaces = 0, the maximum number of faces is not restricted. +# @return List of GEOM_Objects, containing the retrieved blocks. +# +# Example: see GEOM_TestOthers.py def MakeBlockExplode(theCompound, theMinNbFaces, theMaxNbFaces): - """ - * Get all the blocks, contained in the given compound. - * \param theCompound The compound to explode. - * \param theMinNbFaces If solid has lower number of faces, it is not a block. - * \param theMaxNbFaces If solid has higher number of faces, it is not a block. - * \note If theMaxNbFaces = 0, the maximum number of faces is not restricted. - * \return List of GEOM_Objects, containing the retrieved blocks. - - * Example: see GEOM_TestOthers.py - """ aList = BlocksOp.ExplodeCompoundOfBlocks(theCompound, theMinNbFaces, theMaxNbFaces) if BlocksOp.IsDone() == 0: print "MakeBlockExplode : ", BlocksOp.GetErrorCode() return aList +## Find block, containing the given point inside its volume or on boundary. +# @param theCompound Compound, to find block in. +# @param thePoint Point, close to the desired block. If the point lays on +# boundary between some blocks, we return block with nearest center. +# @return New GEOM_Object, containing the found block. +# +# Example: see GEOM_Spanner.py def GetBlockNearPoint(theCompound, thePoint): - """ - * Find block, containing the given point inside its volume or on boundary. - * \param theCompound Compound, to find block in. - * \param thePoint Point, close to the desired block. If the point lays on - * boundary between some blocks, we return block with nearest center. - * \return New GEOM_Object, containing the found block. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.GetBlockNearPoint(theCompound, thePoint) if BlocksOp.IsDone() == 0: print "GetBlockNearPoint : ", BlocksOp.GetErrorCode() return anObj +## Find block, containing all the elements, passed as the parts, or maximum quantity of them. +# @param theCompound Compound, to find block in. +# @param theParts List of faces and/or edges and/or vertices to be parts of the found block. +# @return New GEOM_Object, containing the found block. +# +# Example: see GEOM_TestOthers.py def GetBlockByParts(theCompound, theParts): - """ - * Find block, containing all the elements, passed as the parts, or maximum quantity of them. - * \param theCompound Compound, to find block in. - * \param theParts List of faces and/or edges and/or vertices to be parts of the found block. - * \return New GEOM_Object, containing the found block. - - * Example: see GEOM_TestOthers.py - """ anObj = BlocksOp.GetBlockByParts(theCompound, theParts) if BlocksOp.IsDone() == 0: print "GetBlockByParts : ", BlocksOp.GetErrorCode() return anObj +## Return all blocks, containing all the elements, passed as the parts. +# @param theCompound Compound, to find blocks in. +# @param theParts List of faces and/or edges and/or vertices to be parts of the found blocks. +# @return List of GEOM_Objects, containing the found blocks. +# +# Example: see GEOM_Spanner.py def GetBlocksByParts(theCompound, theParts): - """ - * Return all blocks, containing all the elements, passed as the parts. - * \param theCompound Compound, to find blocks in. - * \param theParts List of faces and/or edges and/or vertices to be parts of the found blocks. - * \return List of GEOM_Objects, containing the found blocks. - - * Example: see GEOM_Spanner.py - """ aList = BlocksOp.GetBlocksByParts(theCompound, theParts) if BlocksOp.IsDone() == 0: print "GetBlocksByParts : ", BlocksOp.GetErrorCode() return aList +## Multi-transformate block and glue the result. +# Transformation is defined so, as to superpose direction faces. +# @param Block Hexahedral solid to be multi-transformed. +# @param DirFace1 ID of First direction face. +# @param DirFace2 ID of Second direction face. +# @param NbTimes Quantity of transformations to be done. +# \note Unique ID of sub-shape can be obtained, using method GetSubShapeID(). +# @return New GEOM_Object, containing the result shape. +# +# Example: see GEOM_Spanner.py def MakeMultiTransformation1D(Block, DirFace1, DirFace2, NbTimes): - """ - * Multi-transformate block and glue the result. - * Transformation is defined so, as to superpose direction faces. - * \param Block Hexahedral solid to be multi-transformed. - * \param DirFace1 ID of First direction face. - * \param DirFace2 ID of Second direction face. - * \param NbTimes Quantity of transformations to be done. - * \note Unique ID of sub-shape can be obtained, using method GetSubShapeID(). - * \return New GEOM_Object, containing the result shape. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.MakeMultiTransformation1D(Block, DirFace1, DirFace2, NbTimes) if BlocksOp.IsDone() == 0: print "MakeMultiTransformation1D : ", BlocksOp.GetErrorCode() return anObj +## Multi-transformate block and glue the result. +# @param Block Hexahedral solid to be multi-transformed. +# @param DirFace1U,DirFace2U IDs of Direction faces for the first transformation. +# @param DirFace1V,DirFace2V IDs of Direction faces for the second transformation. +# @param NbTimesU,NbTimesV Quantity of transformations to be done. +# @return New GEOM_Object, containing the result shape. +# +# Example: see GEOM_Spanner.py def MakeMultiTransformation2D(Block, DirFace1U, DirFace2U, NbTimesU, DirFace1V, DirFace2V, NbTimesV): - """ - * Multi-transformate block and glue the result. - * \param Block Hexahedral solid to be multi-transformed. - * \param DirFace1U,DirFace2U IDs of Direction faces for the first transformation. - * \param DirFace1V,DirFace2V IDs of Direction faces for the second transformation. - * \param NbTimesU,NbTimesV Quantity of transformations to be done. - * \return New GEOM_Object, containing the result shape. - - * Example: see GEOM_Spanner.py - """ anObj = BlocksOp.MakeMultiTransformation2D(Block, DirFace1U, DirFace2U, NbTimesU, DirFace1V, DirFace2V, NbTimesV) if BlocksOp.IsDone() == 0: print "MakeMultiTransformation2D : ", BlocksOp.GetErrorCode() return anObj +## Build all possible propagation groups. +# Propagation group is a set of all edges, opposite to one (main) +# edge of this group directly or through other opposite edges. +# Notion of Opposite Edge make sence only on quadrangle face. +# @param theShape Shape to build propagation groups on. +# @return List of GEOM_Objects, each of them is a propagation group. +# +# Example: see GEOM_TestOthers.py def Propagate(theShape): - """ - * Build all possible propagation groups. - * Propagation group is a set of all edges, opposite to one (main) - * edge of this group directly or through other opposite edges. - * Notion of Opposite Edge make sence only on quadrangle face. - * \param theShape Shape to build propagation groups on. - * \return List of GEOM_Objects, each of them is a propagation group. - - * Example: see GEOM_TestOthers.py - """ listChains = BlocksOp.Propagate(theShape) if BlocksOp.IsDone() == 0: print "Propagate : ", BlocksOp.GetErrorCode() @@ -2417,131 +2164,112 @@ def Propagate(theShape): # Group operations # ----------------------------------------------------------------------------- +## 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 +# +# Example: see GEOM_TestOthers.py def CreateGroup(theMainShape, theShapeType): - """ - * 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 - - * Example: see GEOM_TestOthers.py - """ anObj = GroupOp.CreateGroup(theMainShape, theShapeType) if GroupOp.IsDone() == 0: print "CreateGroup : ", GroupOp.GetErrorCode() return anObj +## 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. +# \note Use method GetSubShapeID() to get an unique ID of the sub shape +# +# Example: see GEOM_TestOthers.py def AddObject(theGroup, theSubShapeID): - """ - * 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. - * \note Use method GetSubShapeID() to get an unique ID of the sub shape - - * Example: see GEOM_TestOthers.py - """ GroupOp.AddObject(theGroup, theSubShapeID) if GroupOp.IsDone() == 0: print "AddObject : ", GroupOp.GetErrorCode() +## 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. +# \note Use method GetSubShapeID() to get an unique ID of the sub shape +# +# Example: see GEOM_TestOthers.py def RemoveObject(theGroup, theSubShapeID): - """ - * 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. - * \note Use method GetSubShapeID() to get an unique ID of the sub shape - - * Example: see GEOM_TestOthers.py - """ GroupOp.RemoveObject(theGroup, theSubShapeID) if GroupOp.IsDone() == 0: print "RemoveObject : ", GroupOp.GetErrorCode() +## Adds to the group all the given shapes. No errors, if some shapes are alredy included. +# @param theGroup is a GEOM group to which the new sub shapes are added. +# @param theSubShapes is a list of sub shapes to be added. +# +# Example: see GEOM_TestOthers.py def UnionList (theGroup, theSubShapes): - """ - * Adds to the group all the given shapes. No errors, if some shapes are alredy included. - * \param theGroup is a GEOM group to which the new sub shapes are added. - * \param theSubShapes is a list of sub shapes to be added. - - * Example: see GEOM_TestOthers.py - """ GroupOp.UnionList(theGroup, theSubShapes) if GroupOp.IsDone() == 0: print "UnionList : ", GroupOp.GetErrorCode() +## Works like the above method, but argument +# theSubShapes here is a list of sub-shapes indices +# +# Example: see GEOM_TestOthers.py def UnionIDs(theGroup, theSubShapes): - """ - * Works like the above method, but argument - * theSubShapes here is a list of sub-shapes indices - """ GroupOp.UnionIDs(theGroup, theSubShapes) if GroupOp.IsDone() == 0: print "UnionIDs : ", GroupOp.GetErrorCode() +## Removes from the group all the given shapes. No errors, if some shapes are not included. +# @param theGroup is a GEOM group from which the sub-shapes are removed. +# @param theSubShapes is a list of sub-shapes to be removed. +# +# Example: see GEOM_TestOthers.py def DifferenceList (theGroup, theSubShapes): - """ - * Removes from the group all the given shapes. No errors, if some shapes are not included. - * \param theGroup is a GEOM group from which the sub-shapes are removed. - * \param theSubShapes is a list of sub-shapes to be removed. - - * Example: see GEOM_TestOthers.py - """ GroupOp.DifferenceList(theGroup, theSubShapes) if GroupOp.IsDone() == 0: print "DifferenceList : ", GroupOp.GetErrorCode() +## Works like the above method, but argument +# theSubShapes here is a list of sub-shapes indices +# +# Example: see GEOM_TestOthers.py def DifferenceIDs(theGroup, theSubShapes): - """ - * Works like the above method, but argument - * theSubShapes here is a list of sub-shapes indices - """ GroupOp.DifferenceIDs(theGroup, theSubShapes) if GroupOp.IsDone() == 0: print "DifferenceIDs : ", GroupOp.GetErrorCode() +## 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 +# +# Example: see GEOM_TestOthers.py def GetObjectIDs(theGroup): - """ - * 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 - - * Example: see GEOM_TestOthers.py - """ ListIDs = GroupOp.GetObjects(theGroup) if GroupOp.IsDone() == 0: print "GetObjectIDs : ", GroupOp.GetErrorCode() return ListIDs +## Returns a type of sub objects stored in the group +# @param theGroup is a GEOM group which type is returned. +# +# Example: see GEOM_TestOthers.py def GetType(theGroup): - """ - * Returns a type of sub objects stored in the group - * \param theGroup is a GEOM group which type is returned. - - * Example: see GEOM_TestOthers.py - """ aType = GroupOp.GetType(theGroup) if GroupOp.IsDone() == 0: print "GetType : ", GroupOp.GetErrorCode() return aType +## 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 +# +# Example: see GEOM_TestOthers.py def GetMainShape(theGroup): - """ - * 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 - - * Example: see GEOM_TestOthers.py - """ anObj = GroupOp.GetMainShape(theGroup) if GroupOp.IsDone() == 0: print "GetMainShape : ", GroupOp.GetErrorCode() return anObj +## Create group of edges of theShape, whose length is in range [min_length, max_length]. +# If include_min/max == 0, edges with length == min/max_length will not be included in result. def GetEdgesByLength (theShape, min_length, max_length, include_min = 1, include_max = 1): - """ - Create group of edges of theShape, whose length is in range [min_length, max_length]. - If include_min/max == 0, edges with length == min/max_length will not be included in result. - """ - edges = SubShapeAll(theShape, ShapeType["EDGE"]) edges_in_range = [] for edge in edges: @@ -2564,12 +2292,9 @@ def GetEdgesByLength (theShape, min_length, max_length, include_min = 1, include return group_edges +## Create group of edges of selected shape, whose length is in range [min_length, max_length]. +# If include_min/max == 0, edges with length == min/max_length will not be included in result. def SelectEdges (min_length, max_length, include_min = 1, include_max = 1): - """ - Create group of edges of selected shape, whose length is in range [min_length, max_length]. - If include_min/max == 0, edges with length == min/max_length will not be included in result. - """ - nb_selected = sg.SelectedCount() if nb_selected < 1: print "Select a shape before calling this function, please." @@ -2595,9 +2320,7 @@ def SelectEdges (min_length, max_length, include_min = 1, include_max = 1): return group_edges +## Add Path to load python scripts from def addPath(Path): - """ - * Add Path to load python scripts from - """ if (sys.path.count(Path) < 1): sys.path.append(Path) diff --git a/src/GEOM_SWIG/libGEOM_Swig.i b/src/GEOM_SWIG/libGEOM_Swig.i index f10a5baea..b1c76a904 100644 --- a/src/GEOM_SWIG/libGEOM_Swig.i +++ b/src/GEOM_SWIG/libGEOM_Swig.i @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File : libGeometry_Swig.i // Created : Tue Mar 26 15:04:48 2002 diff --git a/src/GenerationGUI/GenerationGUI.cxx b/src/GenerationGUI/GenerationGUI.cxx index 9d757a6c9..6b4bb06c0 100644 --- a/src/GenerationGUI/GenerationGUI.cxx +++ b/src/GenerationGUI/GenerationGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -85,7 +85,7 @@ bool GenerationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) case 4031: aDlg = new GenerationGUI_PrismDlg ( getGeometryGUI(), parent, ""); break; case 4032: aDlg = new GenerationGUI_RevolDlg ( getGeometryGUI(), parent, ""); break; case 4033: aDlg = new GenerationGUI_FillingDlg ( getGeometryGUI(), parent, ""); break; - case 4034: aDlg = new GenerationGUI_PipeDlg ( parent, ""); break; + case 4034: aDlg = new GenerationGUI_PipeDlg ( getGeometryGUI(), parent, ""); break; default: SUIT_Session::session()->activeApplication()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break; } diff --git a/src/GenerationGUI/GenerationGUI.h b/src/GenerationGUI/GenerationGUI.h index 99dc49a26..c4c85c3c5 100644 --- a/src/GenerationGUI/GenerationGUI.h +++ b/src/GenerationGUI/GenerationGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx index 5dde019e0..5026f26b3 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_FillingDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -59,9 +59,8 @@ //================================================================================= GenerationGUI_FillingDlg::GenerationGUI_FillingDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), - myGeometryGUI(theGeometryGUI) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_FILLING"))); QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); @@ -88,6 +87,8 @@ GenerationGUI_FillingDlg::GenerationGUI_FillingDlg(GeometryGUI* theGeometryGUI, Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("filling.htm"); + /* Initialisations */ Init(); } @@ -148,11 +149,11 @@ void GenerationGUI_FillingDlg::Init() connect(GroupPoints->SpinBox_4, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupPoints->SpinBox_5, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_1, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_2, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_3, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_4, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_5, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_1, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_2, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_3, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_4, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_5, SLOT(SetStep(double))); connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; diff --git a/src/GenerationGUI/GenerationGUI_FillingDlg.h b/src/GenerationGUI/GenerationGUI_FillingDlg.h index 6f8baf3a0..e4691b97e 100644 --- a/src/GenerationGUI/GenerationGUI_FillingDlg.h +++ b/src/GenerationGUI/GenerationGUI_FillingDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : GenerationGUI_FillingDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_FILLING_H #define DIALOGBOX_FILLING_H @@ -43,7 +42,8 @@ class GENERATIONGUI_EXPORT GenerationGUI_FillingDlg : public GEOMBase_Skeleton Q_OBJECT public: - GenerationGUI_FillingDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + GenerationGUI_FillingDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~GenerationGUI_FillingDlg(); protected: @@ -56,8 +56,6 @@ private: void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myCompound; /* compound of curves */ Standard_Integer myMinDeg; Standard_Integer myMaxDeg; @@ -76,7 +74,6 @@ private slots: void SelectionIntoArgument(); void SetEditCurrentArgument(); void ValueChangedInSpinBox(double newValue); - }; #endif // DIALOGBOX_FILLING_H diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx index 5cf2f1458..242408d4f 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -55,8 +55,10 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -GenerationGUI_PipeDlg::GenerationGUI_PipeDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +GenerationGUI_PipeDlg::GenerationGUI_PipeDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PIPE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -81,6 +83,8 @@ GenerationGUI_PipeDlg::GenerationGUI_PipeDlg(QWidget* parent, const char* name, Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("pipe_creation.htm"); + /* Initialisations */ Init(); } diff --git a/src/GenerationGUI/GenerationGUI_PipeDlg.h b/src/GenerationGUI/GenerationGUI_PipeDlg.h index a39145e4e..09f5a7215 100644 --- a/src/GenerationGUI/GenerationGUI_PipeDlg.h +++ b/src/GenerationGUI/GenerationGUI_PipeDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : GenerationGUI_PipeDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_PIPE_H #define DIALOGBOX_PIPE_H @@ -43,7 +42,8 @@ class GENERATIONGUI_EXPORT GenerationGUI_PipeDlg : public GEOMBase_Skeleton Q_OBJECT public: - GenerationGUI_PipeDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + GenerationGUI_PipeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~GenerationGUI_PipeDlg(); protected: @@ -59,7 +59,7 @@ private: GEOM::GEOM_Object_var myBase; /* Base shape */ GEOM::GEOM_Object_var myPath; /* Shape, defining the path */ bool myOkBase; - bool myOkPath ; /* to check when arguments are defined */ + bool myOkPath; /* to check when arguments are defined */ DlgRef_2Sel_QTD* GroupPoints; @@ -70,7 +70,6 @@ private slots: void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); - }; #endif // DIALOGBOX_PIPE_H diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx index bc3aa51dc..a4464d5cc 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -50,8 +50,10 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -GenerationGUI_PrismDlg::GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +GenerationGUI_PrismDlg::GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PRISM"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -79,6 +81,8 @@ GenerationGUI_PrismDlg::GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWid Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("extrusion.htm"); + /* Initialisations */ Init(); } @@ -126,10 +130,10 @@ void GenerationGUI_PrismDlg::Init() connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse())); - + connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; @@ -173,39 +177,38 @@ void GenerationGUI_PrismDlg::SelectionIntoArgument() erasePreview(); myEditCurrentArgument->setText(""); - if(IObjectCount() != 1) - { - if(myEditCurrentArgument == GroupPoints->LineEdit1) - myOkBase = false; - else if(myEditCurrentArgument == GroupPoints->LineEdit2) - myOkVec = false; - return; - } - + if (IObjectCount() != 1) { + if (myEditCurrentArgument == GroupPoints->LineEdit1) + myOkBase = false; + else if (myEditCurrentArgument == GroupPoints->LineEdit2) + myOkVec = false; + return; + } + // nbSel == 1 Standard_Boolean testResult = Standard_False; - GEOM::GEOM_Object_ptr aSelectedObject = GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult ); - + GEOM::GEOM_Object_ptr aSelectedObject = + GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult ); + if (!testResult) return; - if(myEditCurrentArgument == GroupPoints->LineEdit1) { + if (myEditCurrentArgument == GroupPoints->LineEdit1) { myOkBase = false; TopoDS_Shape S; - if ( !GEOMBase::GetShape(aSelectedObject, S) || + if (!GEOMBase::GetShape(aSelectedObject, S) || S.ShapeType() <= 2) return; - + myBase = aSelectedObject; myOkBase = true; - } - else if(myEditCurrentArgument == GroupPoints->LineEdit2) { + } else if (myEditCurrentArgument == GroupPoints->LineEdit2) { myVec = aSelectedObject; myOkVec = true; } myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) ); - + displayPreview(); } @@ -284,7 +287,6 @@ void GenerationGUI_PrismDlg::ValueChangedInSpinBox() } - //================================================================================= // function : getHeight() // purpose : @@ -319,9 +321,10 @@ bool GenerationGUI_PrismDlg::isValid( QString& ) bool GenerationGUI_PrismDlg::execute( ObjectList& objects ) { GEOM::GEOM_Object_var anObj; - - anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation() )->MakePrismVecH ( myBase, myVec, getHeight() ); - + + anObj = GEOM::GEOM_I3DPrimOperations::_narrow(getOperation())-> + MakePrismVecH(myBase, myVec, getHeight()); + if ( !anObj->_is_nil() ) objects.push_back( anObj._retn() ); @@ -338,6 +341,3 @@ void GenerationGUI_PrismDlg::onReverse() double anOldValue = GroupPoints->SpinBox_DX->GetValue(); GroupPoints->SpinBox_DX->SetValue( -anOldValue ); } - - - diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h index 528f1cdda..ce0cced89 100644 --- a/src/GenerationGUI/GenerationGUI_PrismDlg.h +++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : GenerationGUI_PrismDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_PRISM_H #define DIALOGBOX_PRISM_H @@ -43,7 +42,8 @@ class GENERATIONGUI_EXPORT GenerationGUI_PrismDlg : public GEOMBase_Skeleton Q_OBJECT public: - GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + GenerationGUI_PrismDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~GenerationGUI_PrismDlg(); protected: @@ -57,8 +57,6 @@ private : void enterEvent(QEvent* e); double getHeight() const; - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myBase; /* Base shape */ GEOM::GEOM_Object_var myVec; /* Vector, defining the direction */ diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx index 14c0d011d..8ef0d44e6 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.cxx +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -52,8 +52,10 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -GenerationGUI_RevolDlg::GenerationGUI_RevolDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +GenerationGUI_RevolDlg::GenerationGUI_RevolDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REVOL"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -81,6 +83,8 @@ GenerationGUI_RevolDlg::GenerationGUI_RevolDlg(GeometryGUI* theGeometryGUI, QWid Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("revolution.htm"); + /* Initialisations */ Init(); } @@ -127,10 +131,10 @@ void GenerationGUI_RevolDlg::Init() connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); - + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), - SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; + SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); initName(tr("GEOM_REVOLUTION")); diff --git a/src/GenerationGUI/GenerationGUI_RevolDlg.h b/src/GenerationGUI/GenerationGUI_RevolDlg.h index 6e393db3f..83be6522b 100644 --- a/src/GenerationGUI/GenerationGUI_RevolDlg.h +++ b/src/GenerationGUI/GenerationGUI_RevolDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : GenerationGUI_RevolDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_REVOLUTION_H #define DIALOGBOX_REVOLUTION_H @@ -45,7 +44,8 @@ class GENERATIONGUI_EXPORT GenerationGUI_RevolDlg : public GEOMBase_Skeleton Q_OBJECT public: - GenerationGUI_RevolDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + GenerationGUI_RevolDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~GenerationGUI_RevolDlg(); protected: @@ -59,8 +59,6 @@ private : void enterEvent(QEvent* e); double getAngle() const; - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myBase; /* Base shape */ GEOM::GEOM_Object_var myAxis; /* Axis of the revolution */ bool myOkBase; @@ -77,7 +75,6 @@ private slots: void SetEditCurrentArgument(); void ValueChangedInSpinBox(); void onReverse(); - }; #endif // DIALOGBOX_REVOLUTION_H diff --git a/src/GenerationGUI/Makefile.in b/src/GenerationGUI/Makefile.in index 3ce50cd87..47286a828 100644 --- a/src/GenerationGUI/Makefile.in +++ b/src/GenerationGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -58,8 +58,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase $(CAS_LDPATH) -lTKOffset diff --git a/src/GroupGUI/GroupGUI.cxx b/src/GroupGUI/GroupGUI.cxx index 5bfaf9fca..fc0ebafe3 100644 --- a/src/GroupGUI/GroupGUI.cxx +++ b/src/GroupGUI/GroupGUI.cxx @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -61,7 +61,6 @@ GroupGUI::GroupGUI(GeometryGUI* parent) { } - //======================================================================= // function : ~GroupGUI() // purpose : Destructor @@ -78,13 +77,14 @@ GroupGUI::~GroupGUI() bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) { getGeometryGUI()->EmitSignalDeactivateDialog(); - + QDialog* aDlg = NULL; - SalomeApp_Study* appStudy = dynamic_cast( SUIT_Session::session()->activeApplication()->activeStudy() ); + SUIT_Application* suitApp = SUIT_Session::session()->activeApplication(); + SalomeApp_Study* appStudy = dynamic_cast(suitApp->activeStudy()); if ( !appStudy ) return false; _PTR(Study) aStudy = appStudy->studyDS(); - + if ( aStudy->GetProperties()->IsLocked() ) { SUIT_MessageBox::warn1 ( parent, QObject::tr("WRN_WARNING"), @@ -95,45 +95,42 @@ bool GroupGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) switch ( theCommandID ) { case 800: - case 8001: - aDlg = new GroupGUI_GroupDlg( GroupGUI_GroupDlg::CreateGroup, parent, ""); + case 8001: // CREATE GROUP + aDlg = new GroupGUI_GroupDlg (GroupGUI_GroupDlg::CreateGroup, getGeometryGUI(), parent); break; - case 801: + case 801: // EDIT GROUP { SALOME_ListIO aList; aList.Clear(); - - SalomeApp_Application* app = dynamic_cast< SalomeApp_Application* >( SUIT_Session::session()->activeApplication() ); - if ( app ) { + + SalomeApp_Application* app = dynamic_cast(suitApp); + if (app) { LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); - if ( aSelMgr ) - aSelMgr->selectedObjects( aList ); + if (aSelMgr) + aSelMgr->selectedObjects(aList); } - if ( aList.Extent() == 1 ) { + if (aList.Extent() == 1) { Standard_Boolean aResult = Standard_False; GEOM::GEOM_Object_var anObj = GEOMBase::ConvertIOinGEOMObject( aList.First(), aResult ); - if ( aResult && !CORBA::is_nil( anObj ) && anObj->GetType() == GEOM_GROUP ) { - aDlg = new GroupGUI_GroupDlg( GroupGUI_GroupDlg::EditGroup, parent, "" ); + if (aResult && !CORBA::is_nil(anObj) && anObj->GetType() == GEOM_GROUP) { + aDlg = new GroupGUI_GroupDlg (GroupGUI_GroupDlg::EditGroup, getGeometryGUI(), parent); break; } } - SUIT_MessageBox::warn1 ( parent, - tr("WRN_WARNING"), - tr("NO_GROUP"), - tr("BUT_OK") ); + SUIT_MessageBox::warn1(parent, tr("WRN_WARNING"), tr("NO_GROUP"), tr("BUT_OK") ); break; } default: - SUIT_Session::session()->activeApplication()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); + suitApp->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); break; } - - if ( aDlg != NULL ) + + if (aDlg != NULL) aDlg->show(); - + return true; } diff --git a/src/GroupGUI/GroupGUI.h b/src/GroupGUI/GroupGUI.h index cfe3191a3..a699547ff 100644 --- a/src/GroupGUI/GroupGUI.h +++ b/src/GroupGUI/GroupGUI.h @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index ba28f3724..daa66c165 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -17,7 +17,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -47,12 +47,8 @@ #include -GroupGUI_GroupDlg::GroupGUI_GroupDlg(Mode mode, - QWidget* parent, - const char* name, - bool modal, - WFlags fl) - :GEOMBase_Skeleton( parent, "GroupGUI_GroupDlg", false, +GroupGUI_GroupDlg::GroupGUI_GroupDlg(Mode mode, GeometryGUI* theGeometryGUI, QWidget* parent) + :GEOMBase_Skeleton( theGeometryGUI, parent, "GroupGUI_GroupDlg", false, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myMode( mode ), myBusy( false ) @@ -115,6 +111,8 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg(Mode mode, aMedLayout->addWidget( myAddBtn, 2, 3 ); aMedLayout->addWidget( myRemBtn, 3, 3 ); + setHelpFileName("working_with_groups.htm"); + Init(); } @@ -205,7 +203,6 @@ void GroupGUI_GroupDlg::ClickOnOk() ClickOnCancel(); } - //================================================================================= // function : ClickOnApply() // purpose : @@ -216,7 +213,10 @@ bool GroupGUI_GroupDlg::ClickOnApply() return false; if ( myMode == CreateGroup ) - initName(); + { + initName(); + myIdList->clear(); + } return true; } @@ -323,6 +323,8 @@ void GroupGUI_GroupDlg::SelectionIntoArgument() // try to find out and process the object browser selection if ( !aMapIndex.Extent() ) { + globalSelection( GEOM_ALLSHAPES ); + GEOM::ListOfGO anObjects; GEOMBase::ConvertListOfIOInListOfGO(selectedIO(), anObjects); GEOM::GEOM_ILocalOperations_var aLocOp = getGeomEngine()->GetILocalOperations( getStudyId() ); @@ -334,6 +336,9 @@ void GroupGUI_GroupDlg::SelectionIntoArgument() aMapIndex.Add( anIndex ); } } + + if ( !myMainObj->_is_nil() ) + localSelection( myMainObj, getShapeType() ); } if (aMapIndex.Extent() >= 1) { @@ -656,8 +661,8 @@ bool GroupGUI_GroupDlg::isValid( QString& theMessage ) RETURN_WITH_MSG( !CORBA::is_nil( myMainObj ), tr( "NO_GROUP" ) ) } - const char* aName = getNewObjectName(); - RETURN_WITH_MSG ( aName && strlen( aName ), tr( "EMPTY_NAME" ) ) + QString aName (getNewObjectName()); + RETURN_WITH_MSG ( !aName.stripWhiteSpace().isEmpty(), tr( "EMPTY_NAME" ) ) RETURN_WITH_MSG ( myIdList->count(), tr( "EMPTY_LIST" ) ) return true; diff --git a/src/GroupGUI/GroupGUI_GroupDlg.h b/src/GroupGUI/GroupGUI_GroupDlg.h index 75879c54d..a42fad91e 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.h +++ b/src/GroupGUI/GroupGUI_GroupDlg.h @@ -17,14 +17,13 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : GroupGUI_GroupDlg.h // Author : Sergey ANIKIN // Module : GEOM -// $Header$ #ifndef GROUPGUI_GROUPDLG_H #define GROUPGUI_GROUPDLG_H @@ -50,7 +49,7 @@ public: EditGroup } Mode; - GroupGUI_GroupDlg(Mode mode, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + GroupGUI_GroupDlg(Mode mode, GeometryGUI*, QWidget* parent = 0); ~GroupGUI_GroupDlg(); protected: @@ -60,7 +59,6 @@ protected: virtual bool execute( ObjectList& objects ); virtual GEOM::GEOM_Object_ptr getFather( GEOM::GEOM_Object_ptr theObj ); - private slots: void ClickOnOk(); bool ClickOnApply(); @@ -90,7 +88,7 @@ private: bool myBusy; GEOM::GEOM_Object_var myMainObj; GEOM::GEOM_Object_var myGroup; - + QPushButton* mySelBtn; QLineEdit* myMainName; QPushButton* mySelSubBtn; diff --git a/src/GroupGUI/Makefile.in b/src/GroupGUI/Makefile.in index 26a351ad4..22a80ca16 100755 --- a/src/GroupGUI/Makefile.in +++ b/src/GroupGUI/Makefile.in @@ -17,7 +17,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -52,8 +52,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase diff --git a/src/IGESExport/IGESExport.cxx b/src/IGESExport/IGESExport.cxx index b48bd2221..e4a031650 100644 --- a/src/IGESExport/IGESExport.cxx +++ b/src/IGESExport/IGESExport.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: IGESExport.cxx // Created: Wed May 19 14:49:45 2004 @@ -58,26 +58,35 @@ extern "C" { IGESEXPORT_EXPORT - int Export(const TopoDS_Shape& theShape, const TCollection_AsciiString& theFileName) + int Export( const TopoDS_Shape& theShape, + const TCollection_AsciiString& theFileName, + const TCollection_AsciiString& theFormatName ) { MESSAGE("Export IGES into file " << theFileName.ToCString()); - try - { - //VRV: OCC 4.0 migration - IGESControl_Controller::Init(); - IGESControl_Writer ICW (Interface_Static::CVal("XSTEP.iges.unit"), - Interface_Static::IVal("XSTEP.iges.writebrep.mode")); - //VRV: OCC 4.0 migration - - ICW.AddShape( theShape ); - ICW.ComputeModel(); - if ( ICW.Write( theFileName.ToCString() ) ) - return 1; - } - catch(Standard_Failure) - { - //THROW_SALOME_CORBA_EXCEPTION("Exception catched in IGESExport", SALOME::BAD_PARAM); - } + try + { + // define, whether to write only faces (5.1 IGES format) + // or shells and solids also (5.3 IGES format) + int aBrepMode = 0; + if (theFormatName.IsEqual("IGES_5_3")) + aBrepMode = 1; + + // initialize writer + IGESControl_Controller::Init(); + //IGESControl_Writer ICW (Interface_Static::CVal("write.iges.unit"), + // Interface_Static::IVal("write.iges.brep.mode")); + IGESControl_Writer ICW (Interface_Static::CVal("write.iges.unit"), aBrepMode); + + // perform shape writing + ICW.AddShape( theShape ); + ICW.ComputeModel(); + if ( ICW.Write( theFileName.ToCString() ) ) + return 1; + } + catch(Standard_Failure) + { + //THROW_SALOME_CORBA_EXCEPTION("Exception catched in IGESExport", SALOME::BAD_PARAM); + } return 0; } } diff --git a/src/IGESExport/Makefile.in b/src/IGESExport/Makefile.in index d9abe4c34..123cc6b23 100644 --- a/src/IGESExport/Makefile.in +++ b/src/IGESExport/Makefile.in @@ -14,7 +14,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -37,9 +37,9 @@ LIB= libIGESExport.la LIB_SRC = IGESExport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKIGES -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKIGES $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx index 1622e34cc..c5fe987ca 100644 --- a/src/IGESImport/IGESImport.cxx +++ b/src/IGESImport/IGESImport.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: IGESImport.cxx // Created: Wed May 19 14:36:35 2004 @@ -58,6 +58,7 @@ extern "C" { IGESIMPORT_EXPORT TopoDS_Shape Import (const TCollection_AsciiString& theFileName, + const TCollection_AsciiString& /*theFormatName*/, TCollection_AsciiString& theError) { IGESControl_Reader aReader; diff --git a/src/IGESImport/Makefile.in b/src/IGESImport/Makefile.in index e9aaaa840..482fd2490 100644 --- a/src/IGESImport/Makefile.in +++ b/src/IGESImport/Makefile.in @@ -14,7 +14,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -37,9 +37,9 @@ LIB= libIGESImport.la LIB_SRC = IGESImport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKIGES -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKIGES $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/Makefile.in b/src/Makefile.in index fe15b01b1..3129cc267 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -15,7 +15,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # diff --git a/src/MeasureGUI/Makefile.in b/src/MeasureGUI/Makefile.in index 7bb4af629..7c3f45974 100644 --- a/src/MeasureGUI/Makefile.in +++ b/src/MeasureGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -84,8 +84,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMBase diff --git a/src/MeasureGUI/MeasureGUI.cxx b/src/MeasureGUI/MeasureGUI.cxx index ac38d28f3..7a07965d1 100644 --- a/src/MeasureGUI/MeasureGUI.cxx +++ b/src/MeasureGUI/MeasureGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -87,17 +87,17 @@ bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) switch ( theCommandID ) { - case 701 : new MeasureGUI_PropertiesDlg ( getGeometryGUI(), parent ); break; // LENGTH, AREA AND VOLUME - case 702 : new MeasureGUI_CenterMassDlg ( parent ); break; // CENTER MASS - case 703 : new MeasureGUI_InertiaDlg ( getGeometryGUI(), parent ); break; // INERTIA - case 7041 : new MeasureGUI_BndBoxDlg ( getGeometryGUI(), parent ); break; // BOUNDING BOX - case 7042 : new MeasureGUI_DistanceDlg ( getGeometryGUI(), parent ); break; // MIN DISTANCE - case 705 : new MeasureGUI_MaxToleranceDlg( getGeometryGUI(), parent ); break; // MAXTOLERANCE - case 706 : new MeasureGUI_WhatisDlg ( getGeometryGUI(), parent ); break; // WHATIS - case 707 : new MeasureGUI_CheckShapeDlg ( getGeometryGUI(), parent ); break; // CHECKSHAPE - case 7072 : new MeasureGUI_CheckCompoundOfBlocksDlg ( getGeometryGUI(), parent ); break; // CHECKCOMPOUND - case 708 : new MeasureGUI_PointDlg ( getGeometryGUI(), parent ); break; // POINT COORDINATES - + case 701 : new MeasureGUI_PropertiesDlg (getGeometryGUI(), parent); break; // LENGTH, AREA AND VOLUME + case 702 : new MeasureGUI_CenterMassDlg (getGeometryGUI(), parent); break; // CENTER MASS + case 703 : new MeasureGUI_InertiaDlg (getGeometryGUI(), parent); break; // INERTIA + case 7041: new MeasureGUI_BndBoxDlg (getGeometryGUI(), parent); break; // BOUNDING BOX + case 7042: new MeasureGUI_DistanceDlg (getGeometryGUI(), parent); break; // MIN DISTANCE + case 705 : new MeasureGUI_MaxToleranceDlg(getGeometryGUI(), parent); break; // MAXTOLERANCE + case 706 : new MeasureGUI_WhatisDlg (getGeometryGUI(), parent); break; // WHATIS + case 707 : new MeasureGUI_CheckShapeDlg (getGeometryGUI(), parent); break; // CHECKSHAPE + case 7072: new MeasureGUI_CheckCompoundOfBlocksDlg (getGeometryGUI(), parent); break; // CHECKCOMPOUND + case 708 : new MeasureGUI_PointDlg (getGeometryGUI(), parent); break; // POINT COORDINATES + default: SUIT_Session::session()->activeApplication()->putInfo( tr( "GEOM_PRP_COMMAND" ).arg( theCommandID ) ); break; @@ -106,33 +106,6 @@ bool MeasureGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) } -//===================================================================================== -// function : MakeCDGAndDisplay() -// purpose : -//===================================================================================== -/*void MeasureGUI::MakeCDGAndDisplay(GEOM::GEOM_Shape_ptr Shape) -{ - QAD_Application::getDesktop()->putInfo("MakeCDGAndDisplay method from MeasureGUI should be reimplemented ..."); - - try { - GEOM::GEOM_Shape_var result = myGeom->MakeCDG(Shape); - if(result->_is_nil()) { - QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_ABORT")); - return; - } - result->NameType(tr("GEOM_POINT")); - if(myGeomBase->Display(result)) - QAD_Application::getDesktop()->putInfo(tr("GEOM_PRP_DONE")); - } - catch(const SALOME::SALOME_Exception& S_ex) { - SalomeApp_Tools::QtCatchCorbaException(S_ex); - } - - return; -} -*/ - - //===================================================================================== // EXPORTED METHODS //===================================================================================== diff --git a/src/MeasureGUI/MeasureGUI.h b/src/MeasureGUI/MeasureGUI.h index 0354fb6b3..b312c9e91 100644 --- a/src/MeasureGUI/MeasureGUI.h +++ b/src/MeasureGUI/MeasureGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.cxx b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.cxx index f7b8cb5c5..a8c11caf8 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.cxx +++ b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'MeasureGUI_1Sel12LineEdit_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h index dbdc20bff..92462c9bb 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h +++ b/src/MeasureGUI/MeasureGUI_1Sel12LineEdit_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'MeasureGUI_1Sel12LineEdit_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.cxx b/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.cxx index 42dc1451e..c812dad43 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.cxx +++ b/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'MeasureGUI_1Sel1TextView_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h index 9d17a3422..749da70fb 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h +++ b/src/MeasureGUI/MeasureGUI_1Sel1TextView_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'MeasureGUI_1Sel1TextView_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.cxx b/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.cxx index d7e31ec5c..fe73bf13e 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.cxx +++ b/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'MeasureGUI_1Sel3LineEdit_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h index 1ce61aacc..5bd97c8f9 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h +++ b/src/MeasureGUI/MeasureGUI_1Sel3LineEdit_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'MeasureGUI_1Sel3LineEdit_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.cxx b/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.cxx index 28968b72a..88629b699 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.cxx +++ b/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'MeasureGUI_1Sel6LineEdit_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h index a9126a9a8..6805664ea 100644 --- a/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h +++ b/src/MeasureGUI/MeasureGUI_1Sel6LineEdit_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'MeasureGUI_1Sel6LineEdit_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.cxx b/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.cxx index 211b3bfe8..5010e26b8 100644 --- a/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.cxx +++ b/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'MeasureGUI_2Sel1LineEdit_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h b/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h index 05ea48057..b70505a87 100644 --- a/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h +++ b/src/MeasureGUI/MeasureGUI_2Sel1LineEdit_QTD.h @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'MeasureGUI_2Sel1LineEdit_QTD.ui' diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx index b1e133cfc..225195de5 100644 --- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -88,6 +88,8 @@ MeasureGUI_BndBoxDlg::MeasureGUI_BndBoxDlg( GeometryGUI* GUI, QWidget* parent ) /***************************************************************/ + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Bounding_box"; + /* Initialisation */ Init(); } @@ -189,22 +191,3 @@ SALOME_Prs* MeasureGUI_BndBoxDlg::buildPrs() return !aShape.IsNull() ? getDisplayer()->BuildPrs( aShape ) : 0; } - - - - - - - - - - - - - - - - - - - diff --git a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h b/src/MeasureGUI/MeasureGUI_BndBoxDlg.h index fa9a6a282..cd563a115 100644 --- a/src/MeasureGUI/MeasureGUI_BndBoxDlg.h +++ b/src/MeasureGUI/MeasureGUI_BndBoxDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : MeasureGUI_BndBoxDlg.h // Author : Nicolas REJNERI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_BNDBOX_H #define DIALOGBOX_BNDBOX_H @@ -44,39 +43,23 @@ class GEOM_MEASUREGUI_EXPORT MeasureGUI_BndBoxDlg : public MeasureGUI_Skeleton Q_OBJECT public: - MeasureGUI_BndBoxDlg( GeometryGUI* GUI, - QWidget* parent ); - ~MeasureGUI_BndBoxDlg(); -protected: + MeasureGUI_BndBoxDlg(GeometryGUI* GUI, + QWidget* parent); + ~MeasureGUI_BndBoxDlg(); +protected: // redefined from GEOMBase_Helper and MeasureGUI_Skeleton virtual void processObject(); virtual SALOME_Prs* buildPrs(); private: - void Init(); bool getParameters( double& Xmin, double& Xmax, double& Ymin, double& Ymax, double& Zmin, double& Zmax ); private: - MeasureGUI_1Sel6LineEdit_QTD* myGrp; }; #endif // DIALOGBOX_BNDBOX_H - - - - - - - - - - - - - - diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx index 9191ebd34..ec3acf783 100644 --- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -49,17 +49,16 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -MeasureGUI_CenterMassDlg::MeasureGUI_CenterMassDlg( QWidget* parent ) -: GEOMBase_Skeleton( parent, "MeasureGUI_CenterMassDlg", false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +MeasureGUI_CenterMassDlg::MeasureGUI_CenterMassDlg( GeometryGUI* theGeometryGUI, QWidget* parent ) + : GEOMBase_Skeleton(theGeometryGUI, parent, "MeasureGUI_CenterMassDlg", false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr( "ICON_DLG_CENTERMASS" ) ) ); - QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr( "ICON_SELECT" ) ) ); + QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_CENTERMASS"))); + QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_SELECT"))); setCaption( tr( "GEOM_CMASS_TITLE" ) ); /***************************************************************/ - GroupConstructors->setTitle( tr( "GEOM_CMASS" ) ); RadioButton1->setPixmap( image0 ); RadioButton2->close( TRUE ); @@ -80,6 +79,8 @@ MeasureGUI_CenterMassDlg::MeasureGUI_CenterMassDlg( QWidget* parent ) Layout1->addWidget( myGrp, 2, 0 ); /***************************************************************/ + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Center_gravity"; + /* Initialisation */ Init(); } @@ -337,5 +338,3 @@ bool MeasureGUI_CenterMassDlg::execute( ObjectList& objects ) return true; } - - diff --git a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h index ae9d877c4..943aee4c3 100644 --- a/src/MeasureGUI/MeasureGUI_CenterMassDlg.h +++ b/src/MeasureGUI/MeasureGUI_CenterMassDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -43,11 +43,11 @@ class GEOM_MEASUREGUI_EXPORT MeasureGUI_CenterMassDlg : public GEOMBase_Skeleton Q_OBJECT public: - MeasureGUI_CenterMassDlg( QWidget* parent ); - ~MeasureGUI_CenterMassDlg(); + MeasureGUI_CenterMassDlg( GeometryGUI* GUI, + QWidget* parent ); + ~MeasureGUI_CenterMassDlg(); protected: - // redefined from GEOMBase_Helper virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& msg ); @@ -59,17 +59,15 @@ private slots: void ActivateThisDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); - void SetEditCurrentArgument(); + void SetEditCurrentArgument(); private: - void Init( ); void enterEvent( QEvent* e ); void processObject(); bool getParameters( double&, double&, double& ); private: - GEOM::GEOM_Object_var myObj; MeasureGUI_1Sel3LineEdit_QTD* myGrp; }; diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx index 088c11ccd..92470f71f 100644 --- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -31,7 +31,9 @@ #include "utilities.h" #include "SUIT_Session.h" +#include "LightApp_SelectionMgr.h" #include "SalomeApp_Tools.h" +#include "SalomeApp_Application.h" #include #include @@ -67,32 +69,33 @@ // TRUE to construct a modal dialog. //================================================================================= MeasureGUI_CheckCompoundOfBlocksDlg::MeasureGUI_CheckCompoundOfBlocksDlg( GeometryGUI* GUI, QWidget* parent ) -: MeasureGUI_Skeleton( GUI, parent, "MeasureGUI_CheckCompoundOfBlocksDlg" ) + : GEOMBase_Skeleton(GUI, parent, "MeasureGUI_CheckCompoundOfBlocksDlg", false, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose) { - QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( - "GEOM",tr( "ICON_DLG_CHECK_COMPOUND_OF_BLOCKS" ) ) ); - QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( - "GEOM",tr( "ICON_SELECT" ) ) ); + SUIT_ResourceMgr* aResMgr = SUIT_Session::session()->resourceMgr(); + QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_CHECK_COMPOUND_OF_BLOCKS"))); + QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT"))); setCaption( tr( "GEOM_CHECK_BLOCKS_COMPOUND" ) ); /***************************************************************/ - GroupConstructors->setTitle( tr( "GEOM_CHECK_BLOCKS_COMPOUND" ) ); RadioButton1->setPixmap( image0 ); + RadioButton2->close( TRUE ); + RadioButton3->close( TRUE ); myGrp = new MeasureGUI_1Sel1TextView_QTD( this, "myGrp" ); myGrp->GroupBox1->setTitle( tr( "GEOM_CHECK_INFOS" ) ); myGrp->TextLabel1->setText( tr( "GEOM_OBJECT" ) ); + myGrp->TextEdit1->setReadOnly( TRUE ); - QFont aFont( TEXTEDIT_FONT_FAMILY, TEXTEDIT_FONT_SIZE ); aFont.setStyleHint( QFont::TypeWriter, QFont::PreferAntialias ); myGrp->TextEdit1->setFont( aFont ); + myGrp->PushButton1->setPixmap( image1 ); myGrp->LineEdit1->setReadOnly( true ); - /***************************************************************/ QGridLayout* aGBLayout = new QGridLayout( myGrp->GroupBox1->layout() ); aGBLayout->setAlignment( Qt::AlignTop ); @@ -104,8 +107,8 @@ MeasureGUI_CheckCompoundOfBlocksDlg::MeasureGUI_CheckCompoundOfBlocksDlg( Geomet myErrorsLBox->setMinimumSize( 100, 100 ); Layout2->addWidget( myErrorsLBox, 1, 0 ); - - mySubShapesLbl = new QLabel( tr( "GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES" ), myGrp, "BlockCompoundSubShapes" ); + mySubShapesLbl = new QLabel( tr( "GEOM_CHECK_BLOCKS_COMPOUND_SUBSHAPES" ), + myGrp, "BlockCompoundSubShapes" ); Layout2->addWidget( mySubShapesLbl, 0, 1 ); mySubShapesLBox = new QListBox( myGrp, "ListSubShapes" ); @@ -114,14 +117,18 @@ MeasureGUI_CheckCompoundOfBlocksDlg::MeasureGUI_CheckCompoundOfBlocksDlg( Geomet Layout2->addWidget( mySubShapesLBox, 1, 1 ); aGBLayout->addLayout( Layout2, 1, 0 ); - Layout1->addWidget( myGrp, 1, 0 ); + Layout1->addWidget( myGrp, 2, 0 ); + connect( myErrorsLBox, SIGNAL( selectionChanged() ), SLOT( onErrorsListSelectionChanged() ) ); connect( mySubShapesLBox, SIGNAL( selectionChanged() ), SLOT( onSubShapesListSelectionChanged() ) ); + /***************************************************************/ + + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Check_comp_blocks"; + /* Initialisation */ Init(); } - //================================================================================= // function : ~MeasureGUI_CheckCompoundOfBlocksDlg() // purpose : Destroys the object and frees any allocated resources @@ -130,17 +137,126 @@ MeasureGUI_CheckCompoundOfBlocksDlg::~MeasureGUI_CheckCompoundOfBlocksDlg() { } - //================================================================================= // function : Init() // purpose : //================================================================================= void MeasureGUI_CheckCompoundOfBlocksDlg::Init() { + myEditCurrentArgument = myGrp->LineEdit1; + + // signals and slots connections + connect( buttonOk, SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) ); + connect( buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); + + connect( myGrp->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); + connect( myGrp->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); + + connect(myGeomGUI->getApp()->selectionMgr(), + SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); + + initName( tr( "GEOM_BLOCKS_COMPOUND") ); + buttonOk->setEnabled(false); + buttonApply->setEnabled(false); activateSelection(); - mySelBtn = myGrp->PushButton1; - mySelEdit = myGrp->LineEdit1; - MeasureGUI_Skeleton::Init(); + SelectionIntoArgument(); + + // displays Dialog + this->show(); +} + +//================================================================================= +// function : ClickOnOk() +// purpose : +//================================================================================= +void MeasureGUI_CheckCompoundOfBlocksDlg::ClickOnOk() +{ + if (ClickOnApply()) + ClickOnCancel(); +} + +//================================================================================= +// function : ClickOnApply() +// purpose : +//================================================================================= +bool MeasureGUI_CheckCompoundOfBlocksDlg::ClickOnApply() +{ + if ( !onAccept() ) + return false; + + initName(); + return true; +} + +//================================================================================= +// function : SelectionIntoArgument +// purpose : +//================================================================================= +void MeasureGUI_CheckCompoundOfBlocksDlg::SelectionIntoArgument() +{ + erasePreview(); + myObj = GEOM::GEOM_Object::_nil(); + + if (IObjectCount() != 1) { + myGrp->LineEdit1->setText(""); + processObject(); + return; + } + + Standard_Boolean testResult = Standard_False; + GEOM::GEOM_Object_var aSelectedObject = + GEOMBase::ConvertIOinGEOMObject( firstIObject(), testResult ); + + if (!testResult || aSelectedObject->_is_nil()) { + myGrp->LineEdit1->setText(""); + processObject(); + return; + } + + myObj = aSelectedObject; + myGrp->LineEdit1->setText(GEOMBase::GetName(myObj)); + processObject(); + displayPreview(); +} + +//================================================================================= +// function : SetEditCurrentArgument +// purpose : +//================================================================================= +void MeasureGUI_CheckCompoundOfBlocksDlg::SetEditCurrentArgument() +{ + myGrp->LineEdit1->setFocus(); + myEditCurrentArgument = myGrp->LineEdit1; + SelectionIntoArgument(); +} + +//================================================================================= +// function : LineEditReturnPressed() +// purpose : +//================================================================================= +void MeasureGUI_CheckCompoundOfBlocksDlg::LineEditReturnPressed() +{ + QLineEdit* send = (QLineEdit*)sender(); + if (send == myGrp->LineEdit1) { + myEditCurrentArgument = myGrp->LineEdit1; + GEOMBase_Skeleton::LineEditReturnPressed(); + } +} + +//================================================================================= +// function : ActivateThisDialog() +// purpose : +//================================================================================= +void MeasureGUI_CheckCompoundOfBlocksDlg::ActivateThisDialog() +{ + GEOMBase_Skeleton::ActivateThisDialog(); + + LightApp_SelectionMgr* aSel = myGeomGUI->getApp()->selectionMgr(); + if (aSel) + connect(aSel, SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); + + activateSelection(); + displayPreview(); } //================================================================================= @@ -191,10 +307,15 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::processObject() if (isCompoundOfBlocks) { aMsg += tr( "GEOM_CHECK_BLOCKS_COMPOUND_HAS_NO_ERRORS" ); + buttonOk->setEnabled(false); + buttonApply->setEnabled(false); } else { aMsg += tr( "GEOM_CHECK_BLOCKS_COMPOUND_HAS_ERRORS" ); + buttonOk->setEnabled(true); + buttonApply->setEnabled(true); } myGrp->TextEdit1->setText(aMsg); + QStringList aErrList; QString aErrStr( "" ); QString aConSfx( " # " ); @@ -234,10 +355,10 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::processObject() if ( !aErrStr.isEmpty() ) aErrList.append(aErrStr); } + myErrorsLBox->clear(); mySubShapesLBox->clear(); myErrorsLBox->insertStringList(aErrList); - return; } //================================================================================= @@ -292,7 +413,6 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::onErrorsListSelectionChanged() } mySubShapesLBox->clear(); mySubShapesLBox->insertStringList(aSubShapeList); - return; } //================================================================================= @@ -356,7 +476,6 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::onSubShapesListSelectionChanged() } } } - return; } //================================================================================= @@ -370,3 +489,38 @@ void MeasureGUI_CheckCompoundOfBlocksDlg::activateSelection() aMap.Add( GEOM_COMPOUND ); globalSelection( aMap ); } + +//================================================================================= +// function : enterEvent() +// purpose : +//================================================================================= +void MeasureGUI_CheckCompoundOfBlocksDlg::enterEvent(QEvent* e) +{ + if (!GroupConstructors->isEnabled()) + ActivateThisDialog(); +} + +//================================================================================= +// function : isValid +// purpose : +//================================================================================= +bool MeasureGUI_CheckCompoundOfBlocksDlg::isValid( QString& ) +{ + return !myObj->_is_nil(); +} + +//================================================================================= +// function : execute +// purpose : +//================================================================================= +bool MeasureGUI_CheckCompoundOfBlocksDlg::execute( ObjectList& objects ) +{ + GEOM::GEOM_Object_var anObj; + + anObj = GEOM::GEOM_IBlocksOperations::_narrow(getOperation())->CheckAndImprove(myObj); + + if (!anObj->_is_nil()) + objects.push_back(anObj._retn()); + + return true; +} diff --git a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h index 3095ccb4e..58c1b2749 100644 --- a/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h +++ b/src/MeasureGUI/MeasureGUI_CheckCompoundOfBlocksDlg.h @@ -17,21 +17,20 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : MeasureGUI_CheckCompoundOfBlocksDlg.h // Author : VKN // Module : GEOM -// $Header$ #ifndef DIALOGBOX_CHECKCOMPOUNDOFBLOCKSDLG_H #define DIALOGBOX_CHECKCOMPOUNDOFBLOCKSDLG_H #include "GEOM_MeasureGUI.hxx" -#include "MeasureGUI_Skeleton.h" +#include "GEOMBase_Skeleton.h" class MeasureGUI_1Sel1TextView_QTD; class QListBox; @@ -41,40 +40,47 @@ class QLabel; // class : MeasureGUI_CheckCompoundOfBlocksDlg // purpose : //================================================================================= -class GEOM_MEASUREGUI_EXPORT MeasureGUI_CheckCompoundOfBlocksDlg : public MeasureGUI_Skeleton +class GEOM_MEASUREGUI_EXPORT MeasureGUI_CheckCompoundOfBlocksDlg : public GEOMBase_Skeleton { Q_OBJECT public: - MeasureGUI_CheckCompoundOfBlocksDlg( GeometryGUI* GUI, - QWidget* theParent ); - ~MeasureGUI_CheckCompoundOfBlocksDlg(); -protected: + MeasureGUI_CheckCompoundOfBlocksDlg(GeometryGUI* GUI, QWidget* theParent); + ~MeasureGUI_CheckCompoundOfBlocksDlg(); - // redefined from GEOMBase_Helper and MeasureGUI_Skeleton +protected: + // redefined from GEOMBase_Helper and GEOMBase_Skeleton virtual GEOM::GEOM_IOperations_ptr createOperation(); + virtual bool isValid( QString& msg ); + virtual bool execute( ObjectList& objects ); virtual void processObject(); private slots: + void ClickOnOk(); + bool ClickOnApply(); + void ActivateThisDialog(); + void LineEditReturnPressed(); + void SelectionIntoArgument(); + void SetEditCurrentArgument(); void onErrorsListSelectionChanged(); void onSubShapesListSelectionChanged(); private: - - void Init(); - bool getBCErrors( bool& theIsCompoundOfBlocks, - GEOM::GEOM_IBlocksOperations::BCErrors& theErrors); - void activateSelection(); + void Init(); + void enterEvent( QEvent* e ); + bool getBCErrors( bool& theIsCompoundOfBlocks, + GEOM::GEOM_IBlocksOperations::BCErrors& theErrors); + void activateSelection(); private: + GEOM::GEOM_Object_var myObj; + MeasureGUI_1Sel1TextView_QTD* myGrp; - MeasureGUI_1Sel1TextView_QTD* myGrp; - QLabel* myErrorsLbl; - QListBox* myErrorsLBox; - QLabel* mySubShapesLbl; - QListBox* mySubShapesLBox; - + QLabel* myErrorsLbl; + QListBox* myErrorsLBox; + QLabel* mySubShapesLbl; + QListBox* mySubShapesLBox; }; #endif // DIALOGBOX_CHECKCOMPOUNDOFBLOCKSDLG_H diff --git a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx index d63de1040..848e9ff86 100644 --- a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -81,6 +81,8 @@ MeasureGUI_CheckShapeDlg::MeasureGUI_CheckShapeDlg( GeometryGUI* GUI, QWidget* p /***************************************************************/ + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#check"; + /* Initialisation */ Init(); } diff --git a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h index 53b39c4ab..6cba00c64 100644 --- a/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h +++ b/src/MeasureGUI/MeasureGUI_CheckShapeDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx index 5762c0606..d7ac8ed90 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -92,6 +92,8 @@ MeasureGUI_DistanceDlg::MeasureGUI_DistanceDlg( GeometryGUI* GUI, QWidget* paren /***************************************************************/ + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Min_distance"; + /* Initialisation */ Init(); } diff --git a/src/MeasureGUI/MeasureGUI_DistanceDlg.h b/src/MeasureGUI/MeasureGUI_DistanceDlg.h index dd4363bdc..77c619db3 100644 --- a/src/MeasureGUI/MeasureGUI_DistanceDlg.h +++ b/src/MeasureGUI/MeasureGUI_DistanceDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx index 2c36eacac..cd2a6743e 100644 --- a/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_InertiaDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -96,6 +96,8 @@ MeasureGUI_InertiaDlg::MeasureGUI_InertiaDlg( GeometryGUI* GUI, QWidget* parent /***************************************************************/ + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Inertia_axis"; + /* Initialisation */ Init(); } diff --git a/src/MeasureGUI/MeasureGUI_InertiaDlg.h b/src/MeasureGUI/MeasureGUI_InertiaDlg.h index a63372bda..0905d5219 100644 --- a/src/MeasureGUI/MeasureGUI_InertiaDlg.h +++ b/src/MeasureGUI/MeasureGUI_InertiaDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx index 75be01ef7..ed42f2126 100644 --- a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -83,6 +83,8 @@ MeasureGUI_MaxToleranceDlg::MeasureGUI_MaxToleranceDlg( GeometryGUI* GUI, QWidge /***************************************************************/ + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Tolerance"; + /* Initialisation */ Init(); } diff --git a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h index ba213338e..1b36bca03 100644 --- a/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h +++ b/src/MeasureGUI/MeasureGUI_MaxToleranceDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/MeasureGUI/MeasureGUI_PointDlg.cxx b/src/MeasureGUI/MeasureGUI_PointDlg.cxx index 7db3bee11..1a14cc347 100644 --- a/src/MeasureGUI/MeasureGUI_PointDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_PointDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -99,6 +99,8 @@ MeasureGUI_PointDlg::MeasureGUI_PointDlg( GeometryGUI* GUI, QWidget* parent ) Layout1->addWidget( aGrp, 1, 0 ); + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#PointCoord"; + Init(); } diff --git a/src/MeasureGUI/MeasureGUI_PointDlg.h b/src/MeasureGUI/MeasureGUI_PointDlg.h index 2996e7165..ca2789816 100644 --- a/src/MeasureGUI/MeasureGUI_PointDlg.h +++ b/src/MeasureGUI/MeasureGUI_PointDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx index 596cddd4f..ea3bb594c 100644 --- a/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_PropertiesDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -83,6 +83,8 @@ MeasureGUI_PropertiesDlg::MeasureGUI_PropertiesDlg( GeometryGUI* GUI, QWidget* p /***************************************************************/ + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Basic_properties"; + /* Initialisation */ Init(); } diff --git a/src/MeasureGUI/MeasureGUI_PropertiesDlg.h b/src/MeasureGUI/MeasureGUI_PropertiesDlg.h index 420377922..0689c5806 100644 --- a/src/MeasureGUI/MeasureGUI_PropertiesDlg.h +++ b/src/MeasureGUI/MeasureGUI_PropertiesDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.cxx b/src/MeasureGUI/MeasureGUI_Skeleton.cxx index bbfdb0741..bf2fe3391 100644 --- a/src/MeasureGUI/MeasureGUI_Skeleton.cxx +++ b/src/MeasureGUI/MeasureGUI_Skeleton.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -31,9 +31,11 @@ #include "GEOM_Displayer.h" #include "GeometryGUI.h" -#include "SalomeApp_Application.h" +#include "LightApp_Application.h" #include "LightApp_SelectionMgr.h" +#include "SalomeApp_Application.h" #include "SalomeApp_Tools.h" +#include "SUIT_MessageBox.h" #include "SUIT_Session.h" #include "SUIT_OverrideCursor.h" @@ -63,11 +65,13 @@ MeasureGUI_Skeleton::MeasureGUI_Skeleton( GeometryGUI* GUI, mySelBtn = 0; mySelEdit = 0; myDisplayer = 0; + myHelpFileName = ""; if ( !name ) setName( "MeasureGUI_Skeleton" ); buttonClose->setText( tr( "GEOM_BUT_CLOSE" ) ); + buttonHelp->setText(tr("GEOM_BUT_HELP")); buttonClose->setAutoDefault( false ); @@ -100,6 +104,9 @@ void MeasureGUI_Skeleton::Init() connect( buttonClose, SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) ); + + connect( buttonHelp, SIGNAL( clicked() ), + this, SLOT( ClickOnHelp() ) ); connect( myGeomGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT ( DeactivateActiveDialog() ) ); @@ -136,6 +143,22 @@ void MeasureGUI_Skeleton::ClickOnCancel() close(); } +//================================================================================= +// function : ClickOnHelp() +// purpose : +//================================================================================= +void MeasureGUI_Skeleton::ClickOnHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) + app->onHelpContextModule(myGeomGUI ? app->moduleName(myGeomGUI->moduleName()) : QString(""), myHelpFileName); + else { + SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(myHelpFileName), + QObject::tr("BUT_OK")); + } +} //================================================================================= // function : LineEditReturnPressed() diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.h b/src/MeasureGUI/MeasureGUI_Skeleton.h index 1deab1dce..77c5d18f5 100644 --- a/src/MeasureGUI/MeasureGUI_Skeleton.h +++ b/src/MeasureGUI/MeasureGUI_Skeleton.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -55,6 +55,7 @@ public: protected slots: virtual void ClickOnCancel(); + virtual void ClickOnHelp(); virtual void DeactivateActiveDialog(); virtual void ActivateThisDialog(); virtual void SelectionIntoArgument(); @@ -85,6 +86,8 @@ protected: GeometryGUI* myGeomGUI; GEOM_Displayer* myDisplayer; + + QString myHelpFileName; }; #endif // MEASUREGUI_SKELETON_H diff --git a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx index 343064b7e..cc518f461 100644 --- a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx +++ b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx @@ -1,56 +1,55 @@ // Copyright (C) 2005 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 +// 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 +// +// 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 +// 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form implementation generated from reading ui file 'MeasureGUI_Skeleton_QTD.ui' ** -** Created: lun oct 27 11:23:09 2003 -** by: The User Interface Compiler (uic) +** Created: Tue Mar 21 10:10:08 2006 +** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! ****************************************************************************/ + #include "MeasureGUI_Skeleton_QTD.h" #include -#include -#include #include +#include +#include #include #include #include #include -/* - * Constructs a MeasureGUI_Skeleton_QTD which is a child of 'parent', with the +/* + * Constructs a MeasureGUI_Skeleton_QTD as a child of 'parent', with the * name 'name' and widget flags set to 'f'. * * The dialog will by default be modeless, unless you set 'modal' to * TRUE to construct a modal dialog. */ -MeasureGUI_Skeleton_QTD::MeasureGUI_Skeleton_QTD( QWidget* parent, const char* name, bool modal, WFlags fl ) +MeasureGUI_Skeleton_QTD::MeasureGUI_Skeleton_QTD( QWidget* parent, const char* name, bool modal, WFlags fl ) : QDialog( parent, name, modal, fl ) { if ( !name ) setName( "MeasureGUI_Skeleton_QTD" ); - resize( 228, 266 ); setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)7, 0, 0, sizePolicy().hasHeightForWidth() ) ); - setCaption( trUtf8( "MeasureGUI_Skeleton_QTD" ) ); setSizeGripEnabled( TRUE ); MeasureGUI_Skeleton_QTDLayout = new QGridLayout( this, 1, 1, 11, 6, "MeasureGUI_Skeleton_QTDLayout"); @@ -58,7 +57,6 @@ MeasureGUI_Skeleton_QTD::MeasureGUI_Skeleton_QTD( QWidget* parent, const char* GroupButtons = new QGroupBox( this, "GroupButtons" ); GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) ); - GroupButtons->setTitle( trUtf8( "" ) ); GroupButtons->setColumnLayout(0, Qt::Vertical ); GroupButtons->layout()->setSpacing( 6 ); GroupButtons->layout()->setMargin( 11 ); @@ -66,15 +64,16 @@ MeasureGUI_Skeleton_QTD::MeasureGUI_Skeleton_QTD( QWidget* parent, const char* GroupButtonsLayout->setAlignment( Qt::AlignTop ); Layout3 = new QGridLayout( 0, 1, 1, 0, 6, "Layout3"); - QSpacerItem* spacer = new QSpacerItem( 120, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); - Layout3->addItem( spacer, 0, 2 ); - QSpacerItem* spacer_2 = new QSpacerItem( 120, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); - Layout3->addItem( spacer_2, 0, 0 ); + Spacer1 = new QSpacerItem( 120, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ); + Layout3->addItem( Spacer1, 0, 1 ); buttonClose = new QPushButton( GroupButtons, "buttonClose" ); - buttonClose->setText( trUtf8( "&Close" ) ); - Layout3->addWidget( buttonClose, 0, 1 ); + Layout3->addWidget( buttonClose, 0, 0 ); + + buttonHelp = new QPushButton( GroupButtons, "buttonHelp" ); + + Layout3->addWidget( buttonHelp, 0, 2 ); GroupButtonsLayout->addLayout( Layout3, 0, 0 ); @@ -82,7 +81,6 @@ MeasureGUI_Skeleton_QTD::MeasureGUI_Skeleton_QTD( QWidget* parent, const char* GroupConstructors = new QButtonGroup( this, "GroupConstructors" ); GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) ); - GroupConstructors->setTitle( trUtf8( "" ) ); GroupConstructors->setColumnLayout(0, Qt::Vertical ); GroupConstructors->layout()->setSpacing( 6 ); GroupConstructors->layout()->setMargin( 11 ); @@ -92,7 +90,6 @@ MeasureGUI_Skeleton_QTD::MeasureGUI_Skeleton_QTD( QWidget* parent, const char* Layout2 = new QHBoxLayout( 0, 0, 6, "Layout2"); RadioButton1 = new QRadioButton( GroupConstructors, "RadioButton1" ); - RadioButton1->setText( trUtf8( "" ) ); Layout2->addWidget( RadioButton1 ); GroupConstructorsLayout->addLayout( Layout2, 0, 0 ); @@ -101,14 +98,16 @@ MeasureGUI_Skeleton_QTD::MeasureGUI_Skeleton_QTD( QWidget* parent, const char* GroupMedium = new QGroupBox( this, "GroupMedium" ); GroupMedium->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupMedium->sizePolicy().hasHeightForWidth() ) ); - GroupMedium->setTitle( trUtf8( "" ) ); Layout1->addWidget( GroupMedium, 1, 0 ); MeasureGUI_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 ); + languageChange(); + resize( QSize(228, 266).expandedTo(minimumSizeHint()) ); + clearWState( WState_Polished ); } -/* +/* * Destroys the object and frees any allocated resources */ MeasureGUI_Skeleton_QTD::~MeasureGUI_Skeleton_QTD() @@ -116,3 +115,18 @@ MeasureGUI_Skeleton_QTD::~MeasureGUI_Skeleton_QTD() // no need to delete child widgets, Qt does it all for us } +/* + * Sets the strings of the subwidgets using the current + * language. + */ +void MeasureGUI_Skeleton_QTD::languageChange() +{ + setCaption( tr( "MeasureGUI_Skeleton_QTD" ) ); + GroupButtons->setTitle( QString::null ); + buttonClose->setText( tr( "&Close" ) ); + buttonHelp->setText( tr( "&Help" ) ); + GroupConstructors->setTitle( QString::null ); + RadioButton1->setText( QString::null ); + GroupMedium->setTitle( QString::null ); +} + diff --git a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h index d3cb58add..cdc2f7de4 100644 --- a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h +++ b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h @@ -1,30 +1,31 @@ // Copyright (C) 2005 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 +// 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 +// +// 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 +// 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // /**************************************************************************** ** Form interface generated from reading ui file 'MeasureGUI_Skeleton_QTD.ui' ** -** Created: lun oct 27 11:23:09 2003 -** by: The User Interface Compiler (uic) +** Created: Tue Mar 21 10:10:08 2006 +** by: The User Interface Compiler ($Id$) ** ** WARNING! All changes made in this file will be lost! ****************************************************************************/ + #ifndef MEASUREGUI_SKELETON_QTD_H #define MEASUREGUI_SKELETON_QTD_H @@ -32,16 +33,18 @@ #include #include -class QVBoxLayout; -class QHBoxLayout; -class QGridLayout; -class QButtonGroup; + +class QVBoxLayout; +class QHBoxLayout; +class QGridLayout; +class QSpacerItem; class QGroupBox; class QPushButton; +class QButtonGroup; class QRadioButton; class GEOM_MEASUREGUI_EXPORT MeasureGUI_Skeleton_QTD : public QDialog -{ +{ Q_OBJECT public: @@ -50,18 +53,23 @@ public: QGroupBox* GroupButtons; QPushButton* buttonClose; + QPushButton* buttonHelp; QButtonGroup* GroupConstructors; QRadioButton* RadioButton1; QGroupBox* GroupMedium; - protected: QGridLayout* MeasureGUI_Skeleton_QTDLayout; QGridLayout* Layout1; QGridLayout* GroupButtonsLayout; QGridLayout* Layout3; + QSpacerItem* Spacer1; QGridLayout* GroupConstructorsLayout; QHBoxLayout* Layout2; + +protected slots: + virtual void languageChange(); + }; #endif // MEASUREGUI_SKELETON_QTD_H diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx index 7bd5a6a81..6ce296232 100644 --- a/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx +++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -84,6 +84,8 @@ MeasureGUI_WhatisDlg::MeasureGUI_WhatisDlg( GeometryGUI* GUI, QWidget* parent ) /***************************************************************/ + myHelpFileName = "files/salome2_sp3_measuregui_functions.htm#Whatis"; + /* Initialisation */ Init(); } diff --git a/src/MeasureGUI/MeasureGUI_WhatisDlg.h b/src/MeasureGUI/MeasureGUI_WhatisDlg.h index 1262762ab..10f3ccf71 100644 --- a/src/MeasureGUI/MeasureGUI_WhatisDlg.h +++ b/src/MeasureGUI/MeasureGUI_WhatisDlg.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui b/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui index d759fb401..07f94c80d 100644 --- a/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui +++ b/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui @@ -89,24 +89,7 @@ 6 - - - Spacer2 - - - Horizontal - - - Expanding - - - - 120 - 0 - - - - + Spacer1 @@ -123,7 +106,7 @@ - + buttonClose @@ -131,6 +114,14 @@ &Close + + + buttonHelp + + + &Help + + diff --git a/src/MeasureGUI/UIFiles/ui_to_cxx b/src/MeasureGUI/UIFiles/ui_to_cxx index 07db6a8f4..6ffec252b 100755 --- a/src/MeasureGUI/UIFiles/ui_to_cxx +++ b/src/MeasureGUI/UIFiles/ui_to_cxx @@ -1,22 +1,22 @@ -// Copyright (C) 2005 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.salome-platform.org/ -// +# Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +# #!/bin/sh #uic -o MeasureGUI_Skeleton_QTD.h MeasureGUI_Skeleton_QTD.ui diff --git a/src/NMTAlgo/Makefile.in b/src/NMTAlgo/Makefile.in index a79769aac..867d63cbb 100644 --- a/src/NMTAlgo/Makefile.in +++ b/src/NMTAlgo/Makefile.in @@ -17,7 +17,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -60,9 +60,9 @@ EXPORT_HEADERS = \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTTools -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTTools $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/NMTAlgo/NMTAlgo.cdl b/src/NMTAlgo/NMTAlgo.cdl index 7fce9ebb9..46ae4c50b 100644 --- a/src/NMTAlgo/NMTAlgo.cdl +++ b/src/NMTAlgo/NMTAlgo.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTAlgo.cdl -- Created: Tue Jan 27 14:39:05 2004 diff --git a/src/NMTAlgo/NMTAlgo_Algo.cdl b/src/NMTAlgo/NMTAlgo_Algo.cdl index a27cf6463..e7d031398 100644 --- a/src/NMTAlgo/NMTAlgo_Algo.cdl +++ b/src/NMTAlgo/NMTAlgo_Algo.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTAlgo_Algo.cdl -- Created: Tue Jan 27 14:41:04 2004 diff --git a/src/NMTAlgo/NMTAlgo_Algo.cxx b/src/NMTAlgo/NMTAlgo_Algo.cxx index 82b04d14b..7e21d48c9 100644 --- a/src/NMTAlgo/NMTAlgo_Algo.cxx +++ b/src/NMTAlgo/NMTAlgo_Algo.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTAlgo_Algo.cxx // Created: Tue Jan 27 14:58:21 2004 diff --git a/src/NMTAlgo/NMTAlgo_Algo.hxx b/src/NMTAlgo/NMTAlgo_Algo.hxx index afa9726cd..b7012d17a 100644 --- a/src/NMTAlgo/NMTAlgo_Algo.hxx +++ b/src/NMTAlgo/NMTAlgo_Algo.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTAlgo_Algo_HeaderFile #define _NMTAlgo_Algo_HeaderFile diff --git a/src/NMTAlgo/NMTAlgo_Algo.ixx b/src/NMTAlgo/NMTAlgo_Algo.ixx index 0d5a23360..d27ea6328 100644 --- a/src/NMTAlgo/NMTAlgo_Algo.ixx +++ b/src/NMTAlgo/NMTAlgo_Algo.ixx @@ -1,19 +1,20 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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. // -#include - - - +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +#include diff --git a/src/NMTAlgo/NMTAlgo_Algo.jxx b/src/NMTAlgo/NMTAlgo_Algo.jxx index 919494580..9704d760e 100644 --- a/src/NMTAlgo/NMTAlgo_Algo.jxx +++ b/src/NMTAlgo/NMTAlgo_Algo.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _NMTTools_DSFiller_HeaderFile #include diff --git a/src/NMTAlgo/NMTAlgo_Builder.cdl b/src/NMTAlgo/NMTAlgo_Builder.cdl index 6f1aa3291..8a0982428 100644 --- a/src/NMTAlgo/NMTAlgo_Builder.cdl +++ b/src/NMTAlgo/NMTAlgo_Builder.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTAlgo_Builder.cdl -- Created: Tue Jan 27 15:09:45 2004 diff --git a/src/NMTAlgo/NMTAlgo_Builder.cxx b/src/NMTAlgo/NMTAlgo_Builder.cxx index 7be4895b3..cd422a419 100644 --- a/src/NMTAlgo/NMTAlgo_Builder.cxx +++ b/src/NMTAlgo/NMTAlgo_Builder.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTAlgo_Inter3d.cxx // Created: Tue Jan 27 15:14:13 2004 diff --git a/src/NMTAlgo/NMTAlgo_Builder.hxx b/src/NMTAlgo/NMTAlgo_Builder.hxx index a39a1c505..e4ac3fc35 100644 --- a/src/NMTAlgo/NMTAlgo_Builder.hxx +++ b/src/NMTAlgo/NMTAlgo_Builder.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTAlgo_Builder_HeaderFile #define _NMTAlgo_Builder_HeaderFile diff --git a/src/NMTAlgo/NMTAlgo_Builder.ixx b/src/NMTAlgo/NMTAlgo_Builder.ixx index 09480b40e..8b48a26b7 100644 --- a/src/NMTAlgo/NMTAlgo_Builder.ixx +++ b/src/NMTAlgo/NMTAlgo_Builder.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTAlgo/NMTAlgo_Builder.jxx b/src/NMTAlgo/NMTAlgo_Builder.jxx index 06f18a20a..874fa7fc2 100644 --- a/src/NMTAlgo/NMTAlgo_Builder.jxx +++ b/src/NMTAlgo/NMTAlgo_Builder.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _NMTTools_DSFiller_HeaderFile #include diff --git a/src/NMTAlgo/NMTAlgo_Loop3d.cdl b/src/NMTAlgo/NMTAlgo_Loop3d.cdl index 096bd9b5c..0ed4be963 100644 --- a/src/NMTAlgo/NMTAlgo_Loop3d.cdl +++ b/src/NMTAlgo/NMTAlgo_Loop3d.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // class Loop3d from NMTAlgo diff --git a/src/NMTAlgo/NMTAlgo_Loop3d.cxx b/src/NMTAlgo/NMTAlgo_Loop3d.cxx index ae99c5d63..bdf053b2a 100644 --- a/src/NMTAlgo/NMTAlgo_Loop3d.cxx +++ b/src/NMTAlgo/NMTAlgo_Loop3d.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // //using namespace std; diff --git a/src/NMTAlgo/NMTAlgo_Loop3d.hxx b/src/NMTAlgo/NMTAlgo_Loop3d.hxx index 707b3aec4..8285773d1 100644 --- a/src/NMTAlgo/NMTAlgo_Loop3d.hxx +++ b/src/NMTAlgo/NMTAlgo_Loop3d.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTAlgo_Loop3d_HeaderFile #define _NMTAlgo_Loop3d_HeaderFile diff --git a/src/NMTAlgo/NMTAlgo_Loop3d.ixx b/src/NMTAlgo/NMTAlgo_Loop3d.ixx index e546fd196..98aaa0570 100644 --- a/src/NMTAlgo/NMTAlgo_Loop3d.ixx +++ b/src/NMTAlgo/NMTAlgo_Loop3d.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTAlgo/NMTAlgo_Loop3d.jxx b/src/NMTAlgo/NMTAlgo_Loop3d.jxx index f9d9b5b9c..0c62ad933 100644 --- a/src/NMTAlgo/NMTAlgo_Loop3d.jxx +++ b/src/NMTAlgo/NMTAlgo_Loop3d.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/NMTAlgo/NMTAlgo_Splitter.cdl b/src/NMTAlgo/NMTAlgo_Splitter.cdl index 96f8e1340..7d0f5ac85 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter.cdl +++ b/src/NMTAlgo/NMTAlgo_Splitter.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTAlgo_Splitter.cdl -- Created: Tue Jan 27 15:09:45 2004 diff --git a/src/NMTAlgo/NMTAlgo_Splitter.cxx b/src/NMTAlgo/NMTAlgo_Splitter.cxx index 5980d8319..268da634a 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter.cxx +++ b/src/NMTAlgo/NMTAlgo_Splitter.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTAlgo_Splitter.cxx // Created: Thu Jan 29 17:13:03 2004 diff --git a/src/NMTAlgo/NMTAlgo_Splitter.hxx b/src/NMTAlgo/NMTAlgo_Splitter.hxx index 205ecb654..cad4113f6 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter.hxx +++ b/src/NMTAlgo/NMTAlgo_Splitter.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTAlgo_Splitter_HeaderFile #define _NMTAlgo_Splitter_HeaderFile diff --git a/src/NMTAlgo/NMTAlgo_Splitter.ixx b/src/NMTAlgo/NMTAlgo_Splitter.ixx index fdec89e46..7631ad17c 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter.ixx +++ b/src/NMTAlgo/NMTAlgo_Splitter.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTAlgo/NMTAlgo_Splitter.jxx b/src/NMTAlgo/NMTAlgo_Splitter.jxx index 4f708f4f1..ec30120cd 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter.jxx +++ b/src/NMTAlgo/NMTAlgo_Splitter.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/NMTAlgo/NMTAlgo_Splitter1.cdl b/src/NMTAlgo/NMTAlgo_Splitter1.cdl index b8903281f..0bbdc6484 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter1.cdl +++ b/src/NMTAlgo/NMTAlgo_Splitter1.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTAlgo_Splitter1.cdl -- Created: Wed Feb 11 14:23:25 2004 diff --git a/src/NMTAlgo/NMTAlgo_Splitter1.cxx b/src/NMTAlgo/NMTAlgo_Splitter1.cxx index cb9f2861c..b4f21b09d 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter1.cxx +++ b/src/NMTAlgo/NMTAlgo_Splitter1.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTAlgo_Splitter1.cxx // Created: Wed Feb 11 14:26:27 2004 diff --git a/src/NMTAlgo/NMTAlgo_Splitter1.hxx b/src/NMTAlgo/NMTAlgo_Splitter1.hxx index 1948d3508..d0c25b76d 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter1.hxx +++ b/src/NMTAlgo/NMTAlgo_Splitter1.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTAlgo_Splitter1_HeaderFile #define _NMTAlgo_Splitter1_HeaderFile diff --git a/src/NMTAlgo/NMTAlgo_Splitter1.ixx b/src/NMTAlgo/NMTAlgo_Splitter1.ixx index c036c0734..99a4b81d3 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter1.ixx +++ b/src/NMTAlgo/NMTAlgo_Splitter1.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTAlgo/NMTAlgo_Splitter1.jxx b/src/NMTAlgo/NMTAlgo_Splitter1.jxx index b593e438d..4505b535f 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter1.jxx +++ b/src/NMTAlgo/NMTAlgo_Splitter1.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/NMTAlgo/NMTAlgo_Splitter_1.cxx b/src/NMTAlgo/NMTAlgo_Splitter_1.cxx index d3cf01381..4b0c771db 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter_1.cxx +++ b/src/NMTAlgo/NMTAlgo_Splitter_1.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTAlgo_Splitter_1.cxx // Created: Mon Feb 2 14:58:54 2004 diff --git a/src/NMTAlgo/NMTAlgo_Splitter_2.cxx b/src/NMTAlgo/NMTAlgo_Splitter_2.cxx index 801d57334..0748d0d91 100644 --- a/src/NMTAlgo/NMTAlgo_Splitter_2.cxx +++ b/src/NMTAlgo/NMTAlgo_Splitter_2.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTAlgo_Splitter_2.cxx // Created: Mon Feb 9 15:07:51 2004 diff --git a/src/NMTAlgo/NMTAlgo_Tools.cdl b/src/NMTAlgo/NMTAlgo_Tools.cdl index 581235349..3ce389525 100644 --- a/src/NMTAlgo/NMTAlgo_Tools.cdl +++ b/src/NMTAlgo/NMTAlgo_Tools.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTAlgo_Tools.cdl -- Created: Fri Jan 30 16:29:14 2004 diff --git a/src/NMTAlgo/NMTAlgo_Tools.cxx b/src/NMTAlgo/NMTAlgo_Tools.cxx index 894b2d0b6..290f5e0b1 100644 --- a/src/NMTAlgo/NMTAlgo_Tools.cxx +++ b/src/NMTAlgo/NMTAlgo_Tools.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTAlgo_Tools.cxx // Created: Fri Jan 30 16:30:45 2004 diff --git a/src/NMTAlgo/NMTAlgo_Tools.hxx b/src/NMTAlgo/NMTAlgo_Tools.hxx index 78e211eb0..f4c836906 100644 --- a/src/NMTAlgo/NMTAlgo_Tools.hxx +++ b/src/NMTAlgo/NMTAlgo_Tools.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTAlgo_Tools_HeaderFile #define _NMTAlgo_Tools_HeaderFile diff --git a/src/NMTAlgo/NMTAlgo_Tools.ixx b/src/NMTAlgo/NMTAlgo_Tools.ixx index 63e0dbaca..849811e1f 100644 --- a/src/NMTAlgo/NMTAlgo_Tools.ixx +++ b/src/NMTAlgo/NMTAlgo_Tools.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTAlgo/NMTAlgo_Tools.jxx b/src/NMTAlgo/NMTAlgo_Tools.jxx index 2923711df..fc418d607 100644 --- a/src/NMTAlgo/NMTAlgo_Tools.jxx +++ b/src/NMTAlgo/NMTAlgo_Tools.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shell_HeaderFile #include diff --git a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx index b97122941..f036a1f10 100644 --- a/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx +++ b/src/NMTDS/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx @@ -1,17 +1,21 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile #define _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile diff --git a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx index 7ea8762ea..8ffb2d9b2 100644 --- a/src/NMTDS/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx +++ b/src/NMTDS/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx @@ -1,17 +1,21 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile #define _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile diff --git a/src/NMTDS/Makefile.in b/src/NMTDS/Makefile.in index 7bba78233..10be7fd90 100644 --- a/src/NMTDS/Makefile.in +++ b/src/NMTDS/Makefile.in @@ -17,7 +17,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -62,9 +62,9 @@ EXPORT_HEADERS = \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/NMTDS/NMTDS.cdl b/src/NMTDS/NMTDS.cdl index 6da914c15..6eb4abbd8 100644 --- a/src/NMTDS/NMTDS.cdl +++ b/src/NMTDS/NMTDS.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTDS.cdl -- Created: Fri Nov 28 10:13:19 2003 diff --git a/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx b/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx index ad5d74299..26e553190 100644 --- a/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx +++ b/src/NMTDS/NMTDS_CArray1OfIndexRange.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTDS_CArray1OfIndexRange_HeaderFile #define _NMTDS_CArray1OfIndexRange_HeaderFile diff --git a/src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx b/src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx index c6bf6ef6e..fa29895c7 100644 --- a/src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx +++ b/src/NMTDS/NMTDS_CArray1OfIndexRange_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_OutOfRange_HeaderFile diff --git a/src/NMTDS/NMTDS_IndexRange.cdl b/src/NMTDS/NMTDS_IndexRange.cdl index a6b602957..459404a04 100644 --- a/src/NMTDS/NMTDS_IndexRange.cdl +++ b/src/NMTDS/NMTDS_IndexRange.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTDS_IndexRange.cdl -- Created: Fri Nov 28 10:31:05 2003 diff --git a/src/NMTDS/NMTDS_IndexRange.cxx b/src/NMTDS/NMTDS_IndexRange.cxx index 3d4b21d5d..138d77f8f 100644 --- a/src/NMTDS/NMTDS_IndexRange.cxx +++ b/src/NMTDS/NMTDS_IndexRange.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTDS_IndexRange.cxx // Created: Fri Nov 28 10:34:59 2003 diff --git a/src/NMTDS/NMTDS_IndexRange.hxx b/src/NMTDS/NMTDS_IndexRange.hxx index 76984233d..fd1c1cd76 100644 --- a/src/NMTDS/NMTDS_IndexRange.hxx +++ b/src/NMTDS/NMTDS_IndexRange.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTDS_IndexRange_HeaderFile #define _NMTDS_IndexRange_HeaderFile diff --git a/src/NMTDS/NMTDS_IndexRange.ixx b/src/NMTDS/NMTDS_IndexRange.ixx index 0f8218223..beb598c02 100644 --- a/src/NMTDS/NMTDS_IndexRange.ixx +++ b/src/NMTDS/NMTDS_IndexRange.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTDS/NMTDS_IndexRange.jxx b/src/NMTDS/NMTDS_IndexRange.jxx index a7c0bf7e7..d52e44e24 100644 --- a/src/NMTDS/NMTDS_IndexRange.jxx +++ b/src/NMTDS/NMTDS_IndexRange.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _NMTDS_IndexRange_HeaderFile #include diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx index 18d90fc36..49d1fb437 100644 --- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx +++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx @@ -1,18 +1,22 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile #define _NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile diff --git a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx index a69179f00..454f87a63 100644 --- a/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx +++ b/src/NMTDS/NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Transient) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_TypeMismatch_HeaderFile diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx index 94e036470..4899fb0e0 100644 --- a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx +++ b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile #define _NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile diff --git a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx index f3a1280e0..b3eb5d360 100644 --- a/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx +++ b/src/NMTDS/NMTDS_IndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_DomainError_HeaderFile diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx index 9994af005..767db6c4e 100644 --- a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx +++ b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile #define _NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile diff --git a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx index bca4ea7df..4698ffe4a 100644 --- a/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx +++ b/src/NMTDS/NMTDS_ListIteratorOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_NoMoreObject_HeaderFile diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx index 5de01f304..13b7a121c 100644 --- a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx +++ b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx @@ -1,18 +1,22 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile #define _NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile diff --git a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx index f7566ef5f..49e69a396 100644 --- a/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx +++ b/src/NMTDS/NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Transient) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_TypeMismatch_HeaderFile diff --git a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx index 600531c53..382994b64 100644 --- a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx +++ b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile #define _NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile diff --git a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx index f4bdab6ef..1647253a4 100644 --- a/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx +++ b/src/NMTDS/NMTDS_ListOfIndexedDataMapOfShapeAncestorsSuccessors_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_NoSuchObject_HeaderFile diff --git a/src/NMTDS/NMTDS_PShapesDataStructure.hxx b/src/NMTDS/NMTDS_PShapesDataStructure.hxx index 11b37cb09..75e09af84 100644 --- a/src/NMTDS/NMTDS_PShapesDataStructure.hxx +++ b/src/NMTDS/NMTDS_PShapesDataStructure.hxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Pointer) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTDS_PShapesDataStructure_HeaderFile #define _NMTDS_PShapesDataStructure_HeaderFile diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.cdl b/src/NMTDS/NMTDS_ShapesDataStructure.cdl index 16b8e9288..d6341bdf7 100644 --- a/src/NMTDS/NMTDS_ShapesDataStructure.cdl +++ b/src/NMTDS/NMTDS_ShapesDataStructure.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTDS_ShapesDataStructure.cdl -- Created: Mon Dec 1 10:17:05 2003 diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.cxx b/src/NMTDS/NMTDS_ShapesDataStructure.cxx index 0fde81747..8213536c3 100644 --- a/src/NMTDS/NMTDS_ShapesDataStructure.cxx +++ b/src/NMTDS/NMTDS_ShapesDataStructure.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTDS_ShapesDataStructure.cxx // Created: Mon Dec 1 10:21:04 2003 diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.hxx b/src/NMTDS/NMTDS_ShapesDataStructure.hxx index 3eab46368..af4bda55d 100644 --- a/src/NMTDS/NMTDS_ShapesDataStructure.hxx +++ b/src/NMTDS/NMTDS_ShapesDataStructure.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTDS_ShapesDataStructure_HeaderFile #define _NMTDS_ShapesDataStructure_HeaderFile diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.ixx b/src/NMTDS/NMTDS_ShapesDataStructure.ixx index 755a41624..6a84be39f 100644 --- a/src/NMTDS/NMTDS_ShapesDataStructure.ixx +++ b/src/NMTDS/NMTDS_ShapesDataStructure.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTDS/NMTDS_ShapesDataStructure.jxx b/src/NMTDS/NMTDS_ShapesDataStructure.jxx index 445438ac2..dbeaba7b7 100644 --- a/src/NMTDS/NMTDS_ShapesDataStructure.jxx +++ b/src/NMTDS/NMTDS_ShapesDataStructure.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/NMTTools/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx b/src/NMTTools/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx index b97122941..f036a1f10 100644 --- a/src/NMTTools/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx +++ b/src/NMTTools/Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger.hxx @@ -1,17 +1,21 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile #define _Handle_NMTDS_IndexedDataMapNodeOfIndexedDataMapOfIntegerIndexedDataMapOfShapeInteger_HeaderFile diff --git a/src/NMTTools/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx b/src/NMTTools/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx index 7ea8762ea..8ffb2d9b2 100644 --- a/src/NMTTools/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx +++ b/src/NMTTools/Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors.hxx @@ -1,17 +1,21 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile #define _Handle_NMTDS_ListNodeOfListOfIndexedDataMapOfShapeAncestorsSuccessors_HeaderFile diff --git a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx index 17949ac4a..455ba18bd 100644 --- a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx +++ b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx @@ -1,17 +1,21 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile #define _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile diff --git a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx index cbcf4a002..6bbb071ad 100644 --- a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx +++ b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx @@ -1,17 +1,21 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile #define _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile diff --git a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx index 8dfb499b2..63bb65648 100644 --- a/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx +++ b/src/NMTTools/Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx @@ -1,17 +1,21 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile #define _Handle_NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile diff --git a/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx b/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx index a77311063..a141eebb8 100644 --- a/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx +++ b/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCommonBlock.hxx @@ -1,17 +1,21 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_NMTTools_ListNodeOfListOfCommonBlock_HeaderFile #define _Handle_NMTTools_ListNodeOfListOfCommonBlock_HeaderFile diff --git a/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx b/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx index 66f885016..47ad735ce 100644 --- a/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx +++ b/src/NMTTools/Handle_NMTTools_ListNodeOfListOfCoupleOfShape.hxx @@ -1,17 +1,21 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _Handle_NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile #define _Handle_NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile diff --git a/src/NMTTools/Makefile.in b/src/NMTTools/Makefile.in index 77cdada9e..c3743847f 100644 --- a/src/NMTTools/Makefile.in +++ b/src/NMTTools/Makefile.in @@ -17,7 +17,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -93,9 +93,9 @@ EXPORT_HEADERS = \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTDS -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBool -lTKBO -lNMTDS $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/NMTTools/NMTTools.cdl b/src/NMTTools/NMTTools.cdl index 866c8351a..dc10949d9 100644 --- a/src/NMTTools/NMTTools.cdl +++ b/src/NMTTools/NMTTools.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools.cdl -- Created: Thu Dec 4 16:55:49 2003 diff --git a/src/NMTTools/NMTTools_CommonBlock.cdl b/src/NMTTools/NMTTools_CommonBlock.cdl index 4778f6526..039cd74ae 100644 --- a/src/NMTTools/NMTTools_CommonBlock.cdl +++ b/src/NMTTools/NMTTools_CommonBlock.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools_CommonBlock.cdl -- Created: Tue Dec 9 12:11:48 2003 diff --git a/src/NMTTools/NMTTools_CommonBlock.cxx b/src/NMTTools/NMTTools_CommonBlock.cxx index c061fe32d..5924d0e16 100644 --- a/src/NMTTools/NMTTools_CommonBlock.cxx +++ b/src/NMTTools/NMTTools_CommonBlock.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_CommonBlock.cxx // Created: Tue Dec 9 12:23:29 2003 diff --git a/src/NMTTools/NMTTools_CommonBlock.hxx b/src/NMTTools/NMTTools_CommonBlock.hxx index 4964ae8ea..904c6b566 100644 --- a/src/NMTTools/NMTTools_CommonBlock.hxx +++ b/src/NMTTools/NMTTools_CommonBlock.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_CommonBlock_HeaderFile #define _NMTTools_CommonBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_CommonBlock.ixx b/src/NMTTools/NMTTools_CommonBlock.ixx index 334b58a7d..a93f77cb6 100644 --- a/src/NMTTools/NMTTools_CommonBlock.ixx +++ b/src/NMTTools/NMTTools_CommonBlock.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTTools/NMTTools_CommonBlock.jxx b/src/NMTTools/NMTTools_CommonBlock.jxx index 96f3e2846..b02eb5526 100644 --- a/src/NMTTools/NMTTools_CommonBlock.jxx +++ b/src/NMTTools/NMTTools_CommonBlock.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _BOPTools_PaveBlock_HeaderFile #include diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.cdl b/src/NMTTools/NMTTools_CommonBlockAPI.cdl index 884992d6b..8a10dc3a8 100644 --- a/src/NMTTools/NMTTools_CommonBlockAPI.cdl +++ b/src/NMTTools/NMTTools_CommonBlockAPI.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools_CommonBlockAPI.cdl -- Created: Mon Dec 15 11:35:46 2003 diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.cxx b/src/NMTTools/NMTTools_CommonBlockAPI.cxx index b9cb6ec87..b92e98307 100644 --- a/src/NMTTools/NMTTools_CommonBlockAPI.cxx +++ b/src/NMTTools/NMTTools_CommonBlockAPI.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_CommonBlockAPI.cxx // Created: Mon Dec 15 11:38:04 2003 diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.hxx b/src/NMTTools/NMTTools_CommonBlockAPI.hxx index 37e84f4b7..24f8fc645 100644 --- a/src/NMTTools/NMTTools_CommonBlockAPI.hxx +++ b/src/NMTTools/NMTTools_CommonBlockAPI.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_CommonBlockAPI_HeaderFile #define _NMTTools_CommonBlockAPI_HeaderFile diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.ixx b/src/NMTTools/NMTTools_CommonBlockAPI.ixx index 983092a69..4c8755cba 100644 --- a/src/NMTTools/NMTTools_CommonBlockAPI.ixx +++ b/src/NMTTools/NMTTools_CommonBlockAPI.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTTools/NMTTools_CommonBlockAPI.jxx b/src/NMTTools/NMTTools_CommonBlockAPI.jxx index 54a045946..1f6547fd8 100644 --- a/src/NMTTools/NMTTools_CommonBlockAPI.jxx +++ b/src/NMTTools/NMTTools_CommonBlockAPI.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _NMTTools_ListOfCommonBlock_HeaderFile #include diff --git a/src/NMTTools/NMTTools_CommonBlockPool.hxx b/src/NMTTools/NMTTools_CommonBlockPool.hxx index 01e53c6dd..201069847 100644 --- a/src/NMTTools/NMTTools_CommonBlockPool.hxx +++ b/src/NMTTools/NMTTools_CommonBlockPool.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_CommonBlockPool_HeaderFile #define _NMTTools_CommonBlockPool_HeaderFile diff --git a/src/NMTTools/NMTTools_CommonBlockPool_0.cxx b/src/NMTTools/NMTTools_CommonBlockPool_0.cxx index 33f0f2541..7ca7bee08 100644 --- a/src/NMTTools/NMTTools_CommonBlockPool_0.cxx +++ b/src/NMTTools/NMTTools_CommonBlockPool_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_OutOfRange_HeaderFile diff --git a/src/NMTTools/NMTTools_CoupleOfShape.cdl b/src/NMTTools/NMTTools_CoupleOfShape.cdl index 8cb400159..49215b1c4 100644 --- a/src/NMTTools/NMTTools_CoupleOfShape.cdl +++ b/src/NMTTools/NMTTools_CoupleOfShape.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools_CoupleOfShape.cdl -- Created: Wed Jan 28 15:03:39 2004 diff --git a/src/NMTTools/NMTTools_CoupleOfShape.cxx b/src/NMTTools/NMTTools_CoupleOfShape.cxx index 7bc4f2d67..cbb721df1 100644 --- a/src/NMTTools/NMTTools_CoupleOfShape.cxx +++ b/src/NMTTools/NMTTools_CoupleOfShape.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_CoupleOfShape.cxx // Created: Wed Jan 28 15:06:11 2004 diff --git a/src/NMTTools/NMTTools_CoupleOfShape.hxx b/src/NMTTools/NMTTools_CoupleOfShape.hxx index 9a140f7b5..db9a0c535 100644 --- a/src/NMTTools/NMTTools_CoupleOfShape.hxx +++ b/src/NMTTools/NMTTools_CoupleOfShape.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_CoupleOfShape_HeaderFile #define _NMTTools_CoupleOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_CoupleOfShape.ixx b/src/NMTTools/NMTTools_CoupleOfShape.ixx index 1895c6b5a..387747024 100644 --- a/src/NMTTools/NMTTools_CoupleOfShape.ixx +++ b/src/NMTTools/NMTTools_CoupleOfShape.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTTools/NMTTools_CoupleOfShape.jxx b/src/NMTTools/NMTTools_CoupleOfShape.jxx index a44ab4cd5..e7e77a0af 100644 --- a/src/NMTTools/NMTTools_CoupleOfShape.jxx +++ b/src/NMTTools/NMTTools_CoupleOfShape.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/NMTTools/NMTTools_DEProcessor.cdl b/src/NMTTools/NMTTools_DEProcessor.cdl index b57cd543a..9268aaa0d 100644 --- a/src/NMTTools/NMTTools_DEProcessor.cdl +++ b/src/NMTTools/NMTTools_DEProcessor.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools_DEProcessor.cdl -- Created: Wed Sep 12 12:08:37 2001 diff --git a/src/NMTTools/NMTTools_DEProcessor.cxx b/src/NMTTools/NMTTools_DEProcessor.cxx index 277e9e03a..6762a1dd3 100644 --- a/src/NMTTools/NMTTools_DEProcessor.cxx +++ b/src/NMTTools/NMTTools_DEProcessor.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: BOPTools_DEProcessor.cxx // Created: Wed Sep 12 12:10:52 2001 diff --git a/src/NMTTools/NMTTools_DEProcessor.hxx b/src/NMTTools/NMTTools_DEProcessor.hxx index fb3ccbb37..8da33e72b 100644 --- a/src/NMTTools/NMTTools_DEProcessor.hxx +++ b/src/NMTTools/NMTTools_DEProcessor.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_DEProcessor_HeaderFile #define _NMTTools_DEProcessor_HeaderFile diff --git a/src/NMTTools/NMTTools_DEProcessor.ixx b/src/NMTTools/NMTTools_DEProcessor.ixx index 68448380c..5025cc4f6 100644 --- a/src/NMTTools/NMTTools_DEProcessor.ixx +++ b/src/NMTTools/NMTTools_DEProcessor.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTTools/NMTTools_DEProcessor.jxx b/src/NMTTools/NMTTools_DEProcessor.jxx index 61db39d5c..0d86c3f6e 100644 --- a/src/NMTTools/NMTTools_DEProcessor.jxx +++ b/src/NMTTools/NMTTools_DEProcessor.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _NMTTools_PaveFiller_HeaderFile #include diff --git a/src/NMTTools/NMTTools_DSFiller.cdl b/src/NMTTools/NMTTools_DSFiller.cdl index 82d011819..ba69d115b 100644 --- a/src/NMTTools/NMTTools_DSFiller.cdl +++ b/src/NMTTools/NMTTools_DSFiller.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools_DSFiller.cdl -- Created: Fri Dec 5 13:57:03 2003 diff --git a/src/NMTTools/NMTTools_DSFiller.cxx b/src/NMTTools/NMTTools_DSFiller.cxx index 2a2266d49..b46b41c9c 100644 --- a/src/NMTTools/NMTTools_DSFiller.cxx +++ b/src/NMTTools/NMTTools_DSFiller.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_DSFiller.cxx // Created: Fri Dec 5 14:06:34 2003 diff --git a/src/NMTTools/NMTTools_DSFiller.hxx b/src/NMTTools/NMTTools_DSFiller.hxx index 09c398e8e..a84c42cc8 100644 --- a/src/NMTTools/NMTTools_DSFiller.hxx +++ b/src/NMTTools/NMTTools_DSFiller.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_DSFiller_HeaderFile #define _NMTTools_DSFiller_HeaderFile diff --git a/src/NMTTools/NMTTools_DSFiller.ixx b/src/NMTTools/NMTTools_DSFiller.ixx index e55cf6738..297713e85 100644 --- a/src/NMTTools/NMTTools_DSFiller.ixx +++ b/src/NMTTools/NMTTools_DSFiller.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTTools/NMTTools_DSFiller.jxx b/src/NMTTools/NMTTools_DSFiller.jxx index 0eaf5fed7..47a201400 100644 --- a/src/NMTTools/NMTTools_DSFiller.jxx +++ b/src/NMTTools/NMTTools_DSFiller.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx index cf09e4f59..aef005c55 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx +++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger.hxx @@ -1,18 +1,22 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile #define _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx index 1d989956b..26449e638 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx +++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfIndexedMapOfInteger_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Transient) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_TypeMismatch_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx index 7721dd936..82ffd7634 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx +++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape.hxx @@ -1,18 +1,22 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile #define _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx index beaae44e7..bc564341f 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx +++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapeIndexedMapOfShape_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Transient) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_TypeMismatch_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx index 453715207..ad94cd73c 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx +++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock.hxx @@ -1,18 +1,22 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile #define _NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx index fe39f5347..1544f7045 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx +++ b/src/NMTTools/NMTTools_IndexedDataMapNodeOfIndexedDataMapOfShapePaveBlock_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Transient) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_TypeMismatch_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx index f7e220d8e..1c2452184 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx +++ b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile #define _NMTTools_IndexedDataMapOfIndexedMapOfInteger_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx index 0c4124fbc..789dab633 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx +++ b/src/NMTTools/NMTTools_IndexedDataMapOfIndexedMapOfInteger_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_DomainError_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx index 9a7265cde..be19bc803 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx +++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile #define _NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx index 44fb79552..0b5caf8c8 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx +++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapeIndexedMapOfShape_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_DomainError_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx index 7880c6c78..a6add0910 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx +++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile #define _NMTTools_IndexedDataMapOfShapePaveBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx index 4f55cebf3..12441f662 100644 --- a/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx +++ b/src/NMTTools/NMTTools_IndexedDataMapOfShapePaveBlock_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_DomainError_HeaderFile diff --git a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cdl b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cdl index b85337d85..cb3d54e3b 100644 --- a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cdl +++ b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools_IteratorOfCoupleOfShape.cdl -- Created: Thu Dec 4 16:57:48 2003 diff --git a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cxx b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cxx index fb96d6277..181703608 100644 --- a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cxx +++ b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_IteratorOfCoupleOfShape.cxx // Created: Thu Dec 4 17:00:03 2003 diff --git a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.hxx index bcd6d0ef0..d105a1ece 100644 --- a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.hxx +++ b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_IteratorOfCoupleOfShape_HeaderFile #define _NMTTools_IteratorOfCoupleOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.ixx b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.ixx index f83e9fb6a..324415278 100644 --- a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.ixx +++ b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.jxx b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.jxx index ac0d96f7e..6bd779ae2 100644 --- a/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.jxx +++ b/src/NMTTools/NMTTools_IteratorOfCoupleOfShape.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _Standard_NoSuchObject_HeaderFile #include diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx index 362033001..895971ec2 100644 --- a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx +++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_ListIteratorOfListOfCommonBlock_HeaderFile #define _NMTTools_ListIteratorOfListOfCommonBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock_0.cxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock_0.cxx index 10f53977d..d0405a4b8 100644 --- a/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock_0.cxx +++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCommonBlock_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_NoMoreObject_HeaderFile diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx index 3430c79f8..3b621e372 100644 --- a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx +++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_ListIteratorOfListOfCoupleOfShape_HeaderFile #define _NMTTools_ListIteratorOfListOfCoupleOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx index 9cba93370..af51216a2 100644 --- a/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx +++ b/src/NMTTools/NMTTools_ListIteratorOfListOfCoupleOfShape_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_NoMoreObject_HeaderFile diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx index 88cf5854a..a3e47c15b 100644 --- a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx +++ b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock.hxx @@ -1,18 +1,22 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTTools_ListNodeOfListOfCommonBlock_HeaderFile #define _NMTTools_ListNodeOfListOfCommonBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock_0.cxx b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock_0.cxx index ad488952f..5d95b5158 100644 --- a/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock_0.cxx +++ b/src/NMTTools/NMTTools_ListNodeOfListOfCommonBlock_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Transient) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_TypeMismatch_HeaderFile diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx index cde01ee9b..e6ab9e45e 100644 --- a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx +++ b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape.hxx @@ -1,18 +1,22 @@ -// File generated by CPPExt (Transient) +// Copyright (C) 2005 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. // -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile #define _NMTTools_ListNodeOfListOfCoupleOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx index 296236fcb..338b00a33 100644 --- a/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx +++ b/src/NMTTools/NMTTools_ListNodeOfListOfCoupleOfShape_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Transient) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_TypeMismatch_HeaderFile diff --git a/src/NMTTools/NMTTools_ListOfCommonBlock.hxx b/src/NMTTools/NMTTools_ListOfCommonBlock.hxx index 372139c0a..790503439 100644 --- a/src/NMTTools/NMTTools_ListOfCommonBlock.hxx +++ b/src/NMTTools/NMTTools_ListOfCommonBlock.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_ListOfCommonBlock_HeaderFile #define _NMTTools_ListOfCommonBlock_HeaderFile diff --git a/src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx b/src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx index d90f47b4c..df5fc9d70 100644 --- a/src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx +++ b/src/NMTTools/NMTTools_ListOfCommonBlock_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_NoSuchObject_HeaderFile diff --git a/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx b/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx index f92f99443..6e63a0806 100644 --- a/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx +++ b/src/NMTTools/NMTTools_ListOfCoupleOfShape.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_ListOfCoupleOfShape_HeaderFile #define _NMTTools_ListOfCoupleOfShape_HeaderFile diff --git a/src/NMTTools/NMTTools_ListOfCoupleOfShape_0.cxx b/src/NMTTools/NMTTools_ListOfCoupleOfShape_0.cxx index 047fbfa59..30996a951 100644 --- a/src/NMTTools/NMTTools_ListOfCoupleOfShape_0.cxx +++ b/src/NMTTools/NMTTools_ListOfCoupleOfShape_0.cxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include #ifndef _Standard_NoSuchObject_HeaderFile diff --git a/src/NMTTools/NMTTools_PCurveMaker.cdl b/src/NMTTools/NMTTools_PCurveMaker.cdl index 3c38575a0..c040bbf5f 100644 --- a/src/NMTTools/NMTTools_PCurveMaker.cdl +++ b/src/NMTTools/NMTTools_PCurveMaker.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools_PCurveMaker.cdl -- Created: diff --git a/src/NMTTools/NMTTools_PCurveMaker.cxx b/src/NMTTools/NMTTools_PCurveMaker.cxx index 2b139c143..e39b05bf6 100644 --- a/src/NMTTools/NMTTools_PCurveMaker.cxx +++ b/src/NMTTools/NMTTools_PCurveMaker.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PCurveMaker.cxx // Created: diff --git a/src/NMTTools/NMTTools_PCurveMaker.hxx b/src/NMTTools/NMTTools_PCurveMaker.hxx index 5a5397802..951b32d9b 100644 --- a/src/NMTTools/NMTTools_PCurveMaker.hxx +++ b/src/NMTTools/NMTTools_PCurveMaker.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_PCurveMaker_HeaderFile #define _NMTTools_PCurveMaker_HeaderFile diff --git a/src/NMTTools/NMTTools_PCurveMaker.ixx b/src/NMTTools/NMTTools_PCurveMaker.ixx index 28e9ca58d..e3425c15e 100644 --- a/src/NMTTools/NMTTools_PCurveMaker.ixx +++ b/src/NMTTools/NMTTools_PCurveMaker.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTTools/NMTTools_PCurveMaker.jxx b/src/NMTTools/NMTTools_PCurveMaker.jxx index 8d7f0405d..250eeba46 100644 --- a/src/NMTTools/NMTTools_PCurveMaker.jxx +++ b/src/NMTTools/NMTTools_PCurveMaker.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _NMTTools_PCurveMaker_HeaderFile #include diff --git a/src/NMTTools/NMTTools_PDSFiller.hxx b/src/NMTTools/NMTTools_PDSFiller.hxx index 5cc952848..fedc3f393 100644 --- a/src/NMTTools/NMTTools_PDSFiller.hxx +++ b/src/NMTTools/NMTTools_PDSFiller.hxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Pointer) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTTools_PDSFiller_HeaderFile #define _NMTTools_PDSFiller_HeaderFile diff --git a/src/NMTTools/NMTTools_PPaveFiller.hxx b/src/NMTTools/NMTTools_PPaveFiller.hxx index eddf3ed10..766401d4b 100644 --- a/src/NMTTools/NMTTools_PPaveFiller.hxx +++ b/src/NMTTools/NMTTools_PPaveFiller.hxx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Pointer) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #ifndef _NMTTools_PPaveFiller_HeaderFile #define _NMTTools_PPaveFiller_HeaderFile diff --git a/src/NMTTools/NMTTools_PaveFiller.cdl b/src/NMTTools/NMTTools_PaveFiller.cdl index 49616a9ca..2ced14146 100644 --- a/src/NMTTools/NMTTools_PaveFiller.cdl +++ b/src/NMTTools/NMTTools_PaveFiller.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools_PaveFiller.cdl -- Created: Fri Dec 5 14:35:00 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller.cxx b/src/NMTTools/NMTTools_PaveFiller.cxx index 4594b09b4..cfbd9d0f7 100644 --- a/src/NMTTools/NMTTools_PaveFiller.cxx +++ b/src/NMTTools/NMTTools_PaveFiller.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller.cxx // Created: Fri Dec 5 14:58:54 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller.hxx b/src/NMTTools/NMTTools_PaveFiller.hxx index addb7d074..0f33f9908 100644 --- a/src/NMTTools/NMTTools_PaveFiller.hxx +++ b/src/NMTTools/NMTTools_PaveFiller.hxx @@ -1,23 +1,21 @@ -// File generated by CPPExt (Value) -// -// Copyright (C) 1991 - 2000 by -// Matra Datavision SA. All rights reserved. -// -// Copyright (C) 2001 - 2004 by -// Open CASCADE SA. All rights reserved. +// Copyright (C) 2005 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 file is part of the Open CASCADE Technology software. +// 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 // -// This software may be distributed and/or modified under the terms and -// conditions of the Open CASCADE Public License as defined by Open CASCADE SA -// and appearing in the file LICENSE included in the packaging of this file. -// -// This software is distributed on an "AS IS" basis, without warranty of any -// kind, and Open CASCADE SA hereby disclaims all such warranties, -// including without limitation, any warranties of merchantability, fitness -// for a particular purpose or non-infringement. Please see the License for -// the specific terms and conditions governing rights and limitations under the -// License. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_PaveFiller_HeaderFile #define _NMTTools_PaveFiller_HeaderFile diff --git a/src/NMTTools/NMTTools_PaveFiller.ixx b/src/NMTTools/NMTTools_PaveFiller.ixx index 1ef3b7ab3..d4671682a 100644 --- a/src/NMTTools/NMTTools_PaveFiller.ixx +++ b/src/NMTTools/NMTTools_PaveFiller.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTTools/NMTTools_PaveFiller.jxx b/src/NMTTools/NMTTools_PaveFiller.jxx index 07212861d..3c9457ac6 100644 --- a/src/NMTTools/NMTTools_PaveFiller.jxx +++ b/src/NMTTools/NMTTools_PaveFiller.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _BOPTools_InterferencePool_HeaderFile #include diff --git a/src/NMTTools/NMTTools_PaveFiller_0.cxx b/src/NMTTools/NMTTools_PaveFiller_0.cxx index 67951644d..0f1aba49a 100644 --- a/src/NMTTools/NMTTools_PaveFiller_0.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_0.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_0.cxx // Created: Mon Dec 8 11:45:51 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller_1.cxx b/src/NMTTools/NMTTools_PaveFiller_1.cxx index 6aa2d4504..57c923e77 100644 --- a/src/NMTTools/NMTTools_PaveFiller_1.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_1.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_1.cxx // Created: Mon Dec 8 11:47:55 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller_2.cxx b/src/NMTTools/NMTTools_PaveFiller_2.cxx index 33ea053d8..a66bbb610 100644 --- a/src/NMTTools/NMTTools_PaveFiller_2.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_2.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_2.cxx // Created: Mon Dec 8 12:02:56 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller_3.cxx b/src/NMTTools/NMTTools_PaveFiller_3.cxx index 989e6357c..85bcb6599 100644 --- a/src/NMTTools/NMTTools_PaveFiller_3.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_3.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_3.cxx // Created: Mon Dec 8 16:06:56 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller_4.cxx b/src/NMTTools/NMTTools_PaveFiller_4.cxx index 1db2e5a04..33f178c92 100644 --- a/src/NMTTools/NMTTools_PaveFiller_4.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_4.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_4.cxx // Created: Mon Dec 8 17:08:58 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller_5.cxx b/src/NMTTools/NMTTools_PaveFiller_5.cxx index fae995ed9..db8930c00 100644 --- a/src/NMTTools/NMTTools_PaveFiller_5.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_5.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_5.cxx // Created: Mon Dec 15 11:28:33 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller_6.cxx b/src/NMTTools/NMTTools_PaveFiller_6.cxx index 201014510..8c4852a4b 100644 --- a/src/NMTTools/NMTTools_PaveFiller_6.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_6.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_6.cxx // Created: Fri Dec 19 10:27:31 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller_7.cxx b/src/NMTTools/NMTTools_PaveFiller_7.cxx index ebc09a959..50d899ad9 100644 --- a/src/NMTTools/NMTTools_PaveFiller_7.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_7.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_7.cxx // Created: Thu Dec 18 15:14:55 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller_8.cxx b/src/NMTTools/NMTTools_PaveFiller_8.cxx index 007478455..0226377d1 100644 --- a/src/NMTTools/NMTTools_PaveFiller_8.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_8.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_8.cxx // Created: Fri Dec 19 11:15:53 2003 diff --git a/src/NMTTools/NMTTools_PaveFiller_9.cxx b/src/NMTTools/NMTTools_PaveFiller_9.cxx index 2fc560ed2..090e6f2da 100644 --- a/src/NMTTools/NMTTools_PaveFiller_9.cxx +++ b/src/NMTTools/NMTTools_PaveFiller_9.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_PaveFiller_9.cxx // Created: Fri Dec 19 11:15:53 2003 diff --git a/src/NMTTools/NMTTools_Tools.cdl b/src/NMTTools/NMTTools_Tools.cdl index 86ce89dba..da32326ff 100644 --- a/src/NMTTools/NMTTools_Tools.cdl +++ b/src/NMTTools/NMTTools_Tools.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- File: NMTTools_Tools.cdl -- Created: Mon Dec 8 10:32:34 2003 diff --git a/src/NMTTools/NMTTools_Tools.cxx b/src/NMTTools/NMTTools_Tools.cxx index 1193c8f2c..9963ce4d0 100644 --- a/src/NMTTools/NMTTools_Tools.cxx +++ b/src/NMTTools/NMTTools_Tools.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: NMTTools_Tools.cxx // Created: Mon Dec 8 10:35:15 2003 diff --git a/src/NMTTools/NMTTools_Tools.hxx b/src/NMTTools/NMTTools_Tools.hxx index 73236fe90..e85e495f1 100644 --- a/src/NMTTools/NMTTools_Tools.hxx +++ b/src/NMTTools/NMTTools_Tools.hxx @@ -1,16 +1,21 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _NMTTools_Tools_HeaderFile #define _NMTTools_Tools_HeaderFile diff --git a/src/NMTTools/NMTTools_Tools.ixx b/src/NMTTools/NMTTools_Tools.ixx index 80f2f41e7..0d09ae5ae 100644 --- a/src/NMTTools/NMTTools_Tools.ixx +++ b/src/NMTTools/NMTTools_Tools.ixx @@ -1,17 +1,22 @@ -// File generated by CPPExt (Value) -// Copyright (C) 1991,1995 by -// -// MATRA DATAVISION, FRANCE -// -// This software is furnished in accordance with the terms and conditions -// of the contract and with the inclusion of the above copyright notice. -// This software or any other copy thereof may not be provided or otherwise -// be made available to any other person. No title to an ownership of the -// software is hereby transferred. -// -// At the termination of the contract, the software and all copies of this -// software must be deleted. +// Copyright (C) 2005 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.salome-platform.org/ or email : webmaster.salome@opencascade.com + #include diff --git a/src/NMTTools/NMTTools_Tools.jxx b/src/NMTTools/NMTTools_Tools.jxx index f39eecd53..f1360a8de 100644 --- a/src/NMTTools/NMTTools_Tools.jxx +++ b/src/NMTTools/NMTTools_Tools.jxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #ifndef _TopTools_ListOfShape_HeaderFile #include diff --git a/src/OBJECT/GEOM_AISShape.cxx b/src/OBJECT/GEOM_AISShape.cxx index 6db50f6fa..7c89cd2fe 100644 --- a/src/OBJECT/GEOM_AISShape.cxx +++ b/src/OBJECT/GEOM_AISShape.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -192,9 +192,9 @@ void GEOM_AISShape::Compute(const Handle(PrsMgr_PresentationManager3d)& aPresent //a4bis->SetInteriorColor(myShadingColor); myDrawer->ShadingAspect()->SetColor(myShadingColor); - // PAL12113: AIS_Shape::Compute() works correctly with shapes containing no faces + // PAL12113: AIS_Shape::Compute() works correctly with shapes containing no faces //StdPrs_ShadedShape::Add(aPrs,myshape,myDrawer); - AIS_Shape::Compute(aPresentationManager, aPrs, aMode); + AIS_Shape::Compute(aPresentationManager, aPrs, aMode); break; } } diff --git a/src/OBJECT/GEOM_AISShape.hxx b/src/OBJECT/GEOM_AISShape.hxx index a9e12142d..1fa87d0a8 100644 --- a/src/OBJECT/GEOM_AISShape.hxx +++ b/src/OBJECT/GEOM_AISShape.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_AISShape.ixx b/src/OBJECT/GEOM_AISShape.ixx index 7baed81b7..d50ba8db5 100644 --- a/src/OBJECT/GEOM_AISShape.ixx +++ b/src/OBJECT/GEOM_AISShape.ixx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_AISShape.jxx b/src/OBJECT/GEOM_AISShape.jxx index 8f66299fd..9575226d7 100644 --- a/src/OBJECT/GEOM_AISShape.jxx +++ b/src/OBJECT/GEOM_AISShape.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -38,4 +38,4 @@ #endif #ifndef _Prs3d_Presentation_HeaderFile #include -#endif \ No newline at end of file +#endif diff --git a/src/OBJECT/GEOM_AISTrihedron.cxx b/src/OBJECT/GEOM_AISTrihedron.cxx index 5ca66f7fa..8df9e0ff9 100755 --- a/src/OBJECT/GEOM_AISTrihedron.cxx +++ b/src/OBJECT/GEOM_AISTrihedron.cxx @@ -1,72 +1,72 @@ -// GEOM_AISTrihedron : Filter for VTK viewer -// -// 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_AISTrihedron.cxx -// Author : Sergey LITONIN -// Module : SALOME - -#include "GEOM_AISTrihedron.hxx" -#include - -IMPLEMENT_STANDARD_HANDLE(GEOM_AISTrihedron, AIS_Trihedron) -IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron) - -/* - Class : GEOM_AISTrihedron - Description : Interactive object for displaying local CS -*/ - -GEOM_AISTrihedron::GEOM_AISTrihedron( const Handle(Geom_Axis2Placement)& thePlc ) -: AIS_Trihedron( thePlc ) -{ - -} -Handle(SALOME_InteractiveObject) GEOM_AISTrihedron::getIO() -{ - return myObject; -} -Standard_Boolean GEOM_AISTrihedron::hasIO() -{ - return !myObject.IsNull(); -} - -Standard_CString GEOM_AISTrihedron::getName() -{ - return myName.ToCString(); -} -void GEOM_AISTrihedron::setName( Standard_CString aName ) -{ - myName = TCollection_AsciiString( aName ); -} - -void GEOM_AISTrihedron::setIO( const Handle(SALOME_InteractiveObject)& theIO ) -{ - myObject = theIO; -} - - - - - - +// GEOM_AISTrihedron : Filter for VTK viewer +// +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// +// +// File : GEOM_AISTrihedron.cxx +// Author : Sergey LITONIN +// Module : SALOME + +#include "GEOM_AISTrihedron.hxx" +#include + +IMPLEMENT_STANDARD_HANDLE(GEOM_AISTrihedron, AIS_Trihedron) +IMPLEMENT_STANDARD_RTTIEXT(GEOM_AISTrihedron, AIS_Trihedron) + +/* + Class : GEOM_AISTrihedron + Description : Interactive object for displaying local CS +*/ + +GEOM_AISTrihedron::GEOM_AISTrihedron( const Handle(Geom_Axis2Placement)& thePlc ) +: AIS_Trihedron( thePlc ) +{ + +} +Handle(SALOME_InteractiveObject) GEOM_AISTrihedron::getIO() +{ + return myObject; +} +Standard_Boolean GEOM_AISTrihedron::hasIO() +{ + return !myObject.IsNull(); +} + +Standard_CString GEOM_AISTrihedron::getName() +{ + return myName.ToCString(); +} +void GEOM_AISTrihedron::setName( Standard_CString aName ) +{ + myName = TCollection_AsciiString( aName ); +} + +void GEOM_AISTrihedron::setIO( const Handle(SALOME_InteractiveObject)& theIO ) +{ + myObject = theIO; +} + + + + + + \ No newline at end of file diff --git a/src/OBJECT/GEOM_AISTrihedron.hxx b/src/OBJECT/GEOM_AISTrihedron.hxx index bd38a7067..60071c842 100755 --- a/src/OBJECT/GEOM_AISTrihedron.hxx +++ b/src/OBJECT/GEOM_AISTrihedron.hxx @@ -1,81 +1,81 @@ -// GEOM_AISTrihedron : Filter for VTK viewer -// -// 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_AISTrihedron.hxx -// Author : Sergey LITONIN -// Module : SALOME - -#ifndef GEOM_AISTrihedron_HeaderFile -#define GEOM_AISTrihedron_HeaderFile - -#include - -#include -#include -#include - -class Handle(Geom_Axis2Placement); - -DEFINE_STANDARD_HANDLE(GEOM_AISTrihedron, AIS_Trihedron) - -/* - Class : GEOM_AISTrihedron - Description : Interactive object for displaying local CS -*/ - -class GEOM_AISTrihedron : public AIS_Trihedron -{ -public: - - Standard_EXPORT GEOM_AISTrihedron( const Handle(Geom_Axis2Placement)& ); - - Standard_EXPORT Handle(SALOME_InteractiveObject) getIO(); - Standard_EXPORT void setIO( const Handle(SALOME_InteractiveObject)& ); - Standard_EXPORT Standard_Boolean hasIO(); - Standard_EXPORT Standard_CString getName(); - Standard_EXPORT void setName( Standard_CString aName ); - -private: - - TCollection_AsciiString myName; - Handle(SALOME_InteractiveObject) myObject; - -public: - DEFINE_STANDARD_RTTI(GEOM_AISTrihedron) -}; - -#endif - - - - - - - - - - - - - - +// GEOM_AISTrihedron : Filter for VTK viewer +// +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com +// +// +// +// File : GEOM_AISTrihedron.hxx +// Author : Sergey LITONIN +// Module : SALOME + +#ifndef GEOM_AISTrihedron_HeaderFile +#define GEOM_AISTrihedron_HeaderFile + +#include + +#include +#include +#include + +class Handle(Geom_Axis2Placement); + +DEFINE_STANDARD_HANDLE(GEOM_AISTrihedron, AIS_Trihedron) + +/* + Class : GEOM_AISTrihedron + Description : Interactive object for displaying local CS +*/ + +class GEOM_AISTrihedron : public AIS_Trihedron +{ +public: + + Standard_EXPORT GEOM_AISTrihedron( const Handle(Geom_Axis2Placement)& ); + + Standard_EXPORT Handle(SALOME_InteractiveObject) getIO(); + Standard_EXPORT void setIO( const Handle(SALOME_InteractiveObject)& ); + Standard_EXPORT Standard_Boolean hasIO(); + Standard_EXPORT Standard_CString getName(); + Standard_EXPORT void setName( Standard_CString aName ); + +private: + + TCollection_AsciiString myName; + Handle(SALOME_InteractiveObject) myObject; + +public: + DEFINE_STANDARD_RTTI(GEOM_AISTrihedron) +}; + +#endif + + + + + + + + + + + + + + diff --git a/src/OBJECT/GEOM_Actor.cxx b/src/OBJECT/GEOM_Actor.cxx index d549193b1..0e7f3ccba 100644 --- a/src/OBJECT/GEOM_Actor.cxx +++ b/src/OBJECT/GEOM_Actor.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -275,10 +275,10 @@ void GEOM_Actor::Render(vtkRenderer *ren, vtkMapper *Mapper) if(myShape.ShapeType() == TopAbs_VERTEX) { if(ren){ //The parameter determine size of vertex actor relate to diagonal of RendererWindow - static float delta = 0.01; - float X1 = -1, Y1 = -1, Z1 = 0; + static vtkFloatingPointType delta = 0.01; + vtkFloatingPointType X1 = -1, Y1 = -1, Z1 = 0; ren->ViewToWorld(X1,Y1,Z1); - float X2 = +1, Y2 = +1, Z2 = 0; + vtkFloatingPointType X2 = +1, Y2 = +1, Z2 = 0; ren->ViewToWorld(X2,Y2,Z2); Z2 = sqrt((X2-X1)*(X2-X1) + (Y2-Y1)*(Y2-Y1) + (Z2-Z1)*(Z2-Z1)); this->SetScale(Z2*delta); @@ -308,26 +308,26 @@ void GEOM_Actor::SubShapeOff() // Opacity methods //------------------------------------------------------------- -void GEOM_Actor::SetOpacity(float opa) +void GEOM_Actor::SetOpacity(vtkFloatingPointType opa) { //HighlightProperty->SetOpacity(opa); SALOME_Actor::SetOpacity(opa); ShadingProperty->SetOpacity(opa); } -float GEOM_Actor::GetOpacity() { +vtkFloatingPointType GEOM_Actor::GetOpacity() { return ShadingProperty->GetOpacity(); } //------------------------------------------------------------- // Color methods //------------------------------------------------------------- -void GEOM_Actor::SetColor(float r,float g,float b) { +void GEOM_Actor::SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b) { ShadingProperty->SetColor(r,g,b); } -void GEOM_Actor::GetColor(float& r,float& g,float& b) { - float color[3]; +void GEOM_Actor::GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFloatingPointType& b) { + vtkFloatingPointType color[3]; ShadingProperty->GetColor(color); r = color[0]; g = color[1]; diff --git a/src/OBJECT/GEOM_Actor.h b/src/OBJECT/GEOM_Actor.h index fff44b8b2..9fb32dc83 100644 --- a/src/OBJECT/GEOM_Actor.h +++ b/src/OBJECT/GEOM_Actor.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -82,12 +82,12 @@ class GEOM_OBJECT_EXPORT GEOM_Actor : public SALOME_Actor { void SetShadingProperty(vtkProperty* Prop); // Opacity - void SetOpacity(float opa); - float GetOpacity(); + void SetOpacity(vtkFloatingPointType opa); + vtkFloatingPointType GetOpacity(); // Color - void SetColor(float r,float g,float b); - void GetColor(float& r,float& g,float& b); + void SetColor(vtkFloatingPointType r,vtkFloatingPointType g,vtkFloatingPointType b); + void GetColor(vtkFloatingPointType& r,vtkFloatingPointType& g,vtkFloatingPointType& b); virtual bool IsInfinite() {return myIsInfinite;} protected: diff --git a/src/OBJECT/GEOM_AssemblyBuilder.cxx b/src/OBJECT/GEOM_AssemblyBuilder.cxx index 006e591c4..603a071c9 100644 --- a/src/OBJECT/GEOM_AssemblyBuilder.cxx +++ b/src/OBJECT/GEOM_AssemblyBuilder.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_AssemblyBuilder.h b/src/OBJECT/GEOM_AssemblyBuilder.h index a9d1a27f7..36149732c 100644 --- a/src/OBJECT/GEOM_AssemblyBuilder.h +++ b/src/OBJECT/GEOM_AssemblyBuilder.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_InteractiveObject.cxx b/src/OBJECT/GEOM_InteractiveObject.cxx index caa8567e5..628df2d24 100644 --- a/src/OBJECT/GEOM_InteractiveObject.cxx +++ b/src/OBJECT/GEOM_InteractiveObject.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_InteractiveObject.hxx b/src/OBJECT/GEOM_InteractiveObject.hxx index 93911dfe0..cc405f407 100644 --- a/src/OBJECT/GEOM_InteractiveObject.hxx +++ b/src/OBJECT/GEOM_InteractiveObject.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_InteractiveObject.ixx b/src/OBJECT/GEOM_InteractiveObject.ixx index dccdbb94b..20d58cbb2 100644 --- a/src/OBJECT/GEOM_InteractiveObject.ixx +++ b/src/OBJECT/GEOM_InteractiveObject.ixx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_InteractiveObject.jxx b/src/OBJECT/GEOM_InteractiveObject.jxx index 8884bdc8b..94666cbf4 100644 --- a/src/OBJECT/GEOM_InteractiveObject.jxx +++ b/src/OBJECT/GEOM_InteractiveObject.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_OCCReader.cxx b/src/OBJECT/GEOM_OCCReader.cxx index 933c670e9..2bd8dad5d 100644 --- a/src/OBJECT/GEOM_OCCReader.cxx +++ b/src/OBJECT/GEOM_OCCReader.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_OCCReader.h b/src/OBJECT/GEOM_OCCReader.h index c82a84dd0..d17f6d484 100644 --- a/src/OBJECT/GEOM_OCCReader.h +++ b/src/OBJECT/GEOM_OCCReader.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/GEOM_VTKTrihedron.cxx b/src/OBJECT/GEOM_VTKTrihedron.cxx index 3e79afb81..b5dd62de8 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.cxx +++ b/src/OBJECT/GEOM_VTKTrihedron.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -78,15 +78,15 @@ public: vtkTypeMacro( GEOM_VTKTrihedronAxis, VTKViewer_Axis ); static GEOM_VTKTrihedronAxis* New(); - void SetAxis( const gp_Ax1& theAxis, const int theRot, float theColor[ 3 ] ); + void SetAxis( const gp_Ax1& theAxis, const int theRot, vtkFloatingPointType theColor[ 3 ] ); virtual void Render( vtkRenderer* theRenderer ); - virtual void SetSize( float theSize ); + virtual void SetSize( vtkFloatingPointType theSize ); gp_Pnt GetOri() const; - void SetColor( const float theColor[ 3 ] ); + void SetColor( const vtkFloatingPointType theColor[ 3 ] ); private: - float myOri[ 3 ]; + vtkFloatingPointType myOri[ 3 ]; vtkMatrix4x4* myMatrix; vtkTransform* myTrsf; }; @@ -109,11 +109,11 @@ GEOM_VTKTrihedronAxis::~GEOM_VTKTrihedronAxis() myTrsf->Delete(); } -void GEOM_VTKTrihedronAxis::SetSize( float theSize ) +void GEOM_VTKTrihedronAxis::SetSize( vtkFloatingPointType theSize ) { - float aPosition[ 3 ] = { myOri[ 0 ] + myDir[ 0 ] * theSize, - myOri[ 1 ] + myDir[ 1 ] * theSize, - myOri[ 2 ] + myDir[ 2 ] * theSize }; + vtkFloatingPointType aPosition[ 3 ] = { myOri[ 0 ] + myDir[ 0 ] * theSize, + myOri[ 1 ] + myDir[ 1 ] * theSize, + myOri[ 2 ] + myDir[ 2 ] * theSize }; myLineSource->SetPoint1( myOri[ 0 ], myOri[ 1 ], myOri[ 2 ] ); myLineSource->SetPoint2( aPosition ); @@ -158,7 +158,7 @@ gp_Pnt GEOM_VTKTrihedronAxis::GetOri() const void GEOM_VTKTrihedronAxis::SetAxis( const gp_Ax1& theAxis, const int theRot, - float theColor[ 3 ] ) + vtkFloatingPointType theColor[ 3 ] ) { gp_Pnt aLoc = theAxis.Location(); gp_Dir aDir = theAxis.Direction(); @@ -171,7 +171,7 @@ void GEOM_VTKTrihedronAxis::SetAxis( const gp_Ax1& theAxis, myDir[ 1 ] = aDir.Y(); myDir[ 2 ] = aDir.Z(); - float aColor[ 3 ] = { 0, 0, 0 }; + vtkFloatingPointType aColor[ 3 ] = { 0, 0, 0 }; aColor[ theRot ] = 1; vtkProperty* aProperty = vtkProperty::New(); if ( theColor[ 0 ] == -1 ) @@ -186,7 +186,7 @@ void GEOM_VTKTrihedronAxis::SetAxis( const gp_Ax1& theAxis, else if ( theRot == 2 ) myVectorText->SetText( "Z" ); } -void GEOM_VTKTrihedronAxis::SetColor( const float theColor[ 3 ] ) +void GEOM_VTKTrihedronAxis::SetColor( const vtkFloatingPointType theColor[ 3 ] ) { vtkProperty* aProperty = vtkProperty::New(); aProperty->SetColor( theColor[ 0 ], theColor[ 1 ], theColor[ 2 ] ); @@ -222,7 +222,7 @@ GEOM_VTKTrihedron::~GEOM_VTKTrihedron() myMapper->Delete(); } -void GEOM_VTKTrihedron::SetSize( float theSize ) +void GEOM_VTKTrihedron::SetSize( vtkFloatingPointType theSize ) { mySize = theSize; for ( int i = 0; i < 3; i++ ) @@ -351,7 +351,7 @@ void GEOM_VTKTrihedron::Render(vtkRenderer* r, vtkMapper *) ( (GEOM_VTKTrihedronAxis*)myAxis[ 2 ] )->Render( r ); } -void GEOM_VTKTrihedron::SetColor( float r, float g, float b ) +void GEOM_VTKTrihedron::SetColor( vtkFloatingPointType r, vtkFloatingPointType g, vtkFloatingPointType b ) { myColor[ 0 ] = r; myColor[ 1 ] = g; @@ -362,7 +362,7 @@ void GEOM_VTKTrihedron::SetColor( float r, float g, float b ) if ( myAxis[ 2 ] ) ( (GEOM_VTKTrihedronAxis*)myAxis[ 2 ] )->SetColor( myColor ); } -void GEOM_VTKTrihedron::GetColor( float& r, float& g, float& b ) +void GEOM_VTKTrihedron::GetColor( vtkFloatingPointType& r, vtkFloatingPointType& g, vtkFloatingPointType& b ) { r = myColor[ 0 ]; g = myColor[ 1 ]; diff --git a/src/OBJECT/GEOM_VTKTrihedron.hxx b/src/OBJECT/GEOM_VTKTrihedron.hxx index cb1877828..1d9e85347 100644 --- a/src/OBJECT/GEOM_VTKTrihedron.hxx +++ b/src/OBJECT/GEOM_VTKTrihedron.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -57,7 +57,7 @@ public: vtkTypeMacro( GEOM_VTKTrihedron, SALOME_Actor ); static GEOM_VTKTrihedron* New(); - virtual float GetSize() { return mySize;} + virtual vtkFloatingPointType GetSize() { return mySize;} virtual void SetVisibility( VTKViewer_Trihedron::TVisibility theVis ); virtual void VisibilityOff() { SetVisibility( VTKViewer_Trihedron::eOff ); } @@ -75,21 +75,21 @@ public: virtual void Render(vtkRenderer *, vtkMapper *); virtual bool IsSetCamera() const; virtual bool IsResizable() const; - virtual void SetSize( float ); + virtual void SetSize( vtkFloatingPointType ); virtual void SetCamera( vtkCamera* ); - void SetColor( float r, float g, float b ); - void GetColor( float& r, float& g, float& b ); + void SetColor( vtkFloatingPointType r, vtkFloatingPointType g, vtkFloatingPointType b ); + void GetColor( vtkFloatingPointType& r, vtkFloatingPointType& g, vtkFloatingPointType& b ); virtual bool hasHighlight() { return false; } protected: VTKViewer_Axis* myAxis[3]; vtkPolyDataMapper* myMapper; - float mySize; + vtkFloatingPointType mySize; gp_Pnt myLocation; gp_Dir myDirX, myDirY, myDirZ; - float myColor[ 3 ]; + vtkFloatingPointType myColor[ 3 ]; }; #endif diff --git a/src/OBJECT/Handle_GEOM_AISShape.hxx b/src/OBJECT/Handle_GEOM_AISShape.hxx index af8efe053..4c7d4c7d1 100644 --- a/src/OBJECT/Handle_GEOM_AISShape.hxx +++ b/src/OBJECT/Handle_GEOM_AISShape.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/Handle_GEOM_InteractiveObject.hxx b/src/OBJECT/Handle_GEOM_InteractiveObject.hxx index 63c0e8e3f..70c1c92c0 100644 --- a/src/OBJECT/Handle_GEOM_InteractiveObject.hxx +++ b/src/OBJECT/Handle_GEOM_InteractiveObject.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OBJECT/Makefile.in b/src/OBJECT/Makefile.in index dc3bcca0d..77d945662 100644 --- a/src/OBJECT/Makefile.in +++ b/src/OBJECT/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -59,9 +59,9 @@ LIB_CLIENT_IDL = BIN = BIN_SRC = -CPPFLAGS+=$(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -LDFLAGS+=$(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeObject -L${KERNEL_ROOT_DIR}/lib/salome -L${GUI_ROOT_DIR}/lib/salome +CPPFLAGS += $(QT_INCLUDES) $(PYTHON_INCLUDES) $(OCC_INCLUDES) $(VTK_INCLUDES) $(OGL_INCLUDES) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +LDFLAGS += $(PYTHON_LIBS) $(QT_MT_LIBS) $(VTK_LIBS) $(OGL_LIBS) -lSalomeObject $(KERNEL_LDFLAGS) $(GUI_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/OperationGUI/Makefile.in b/src/OperationGUI/Makefile.in index 6b7f980d8..c079fa8e4 100644 --- a/src/OperationGUI/Makefile.in +++ b/src/OperationGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -62,8 +62,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += $(CAS_LDPATH) -lTKFillet -lGEOMBase diff --git a/src/OperationGUI/OperationGUI.cxx b/src/OperationGUI/OperationGUI.cxx index 6838a57d7..e13817f64 100644 --- a/src/OperationGUI/OperationGUI.cxx +++ b/src/OperationGUI/OperationGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -30,6 +30,7 @@ #include "SUIT_Session.h" #include "SUIT_Desktop.h" +#include "SalomeApp_Application.h" #include #include @@ -84,29 +85,18 @@ OperationGUI::~OperationGUI() bool OperationGUI::OnGUIEvent( int theCommandID, SUIT_Desktop* parent ) { getGeometryGUI()->EmitSignalDeactivateDialog(); - - switch ( theCommandID ) + + switch (theCommandID) { - case 503: // PARTITION - ( new OperationGUI_PartitionDlg( parent, "" ) )->show(); - break; - case 504: // ARCHIMEDE - new OperationGUI_ArchimedeDlg( getGeometryGUI(), parent ); - break; - case 505: // FILLET - new OperationGUI_FilletDlg( parent ); - break; - case 506: // CHAMFER - new OperationGUI_ChamferDlg( parent ); - break; - case 507: // CLIPPING RANGE - ( new OperationGUI_ClippingDlg( parent, "" ) )->show(); - break; - default: - SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); - break; + case 503: (new OperationGUI_PartitionDlg(getGeometryGUI(), parent))->show(); break; + case 504: (new OperationGUI_ArchimedeDlg(getGeometryGUI(), parent))->show(); break; + case 505: (new OperationGUI_FilletDlg (getGeometryGUI(), parent))->show(); break; + case 506: (new OperationGUI_ChamferDlg (getGeometryGUI(), parent))->show(); break; + case 507: (new OperationGUI_ClippingDlg (getGeometryGUI(), parent))->show(); break; + default: + getGeometryGUI()->getApp()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); } - + return true; } diff --git a/src/OperationGUI/OperationGUI.h b/src/OperationGUI/OperationGUI.h index 02e38cf12..2fc7059ef 100644 --- a/src/OperationGUI/OperationGUI.h +++ b/src/OperationGUI/OperationGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx index 0d024e7f3..149fdba75 100644 --- a/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx +++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -44,8 +44,8 @@ // TRUE to construct a modal dialog. //================================================================================= OperationGUI_ArchimedeDlg::OperationGUI_ArchimedeDlg( GeometryGUI* theGeometryGUI, QWidget* parent ) -: GEOMBase_Skeleton( parent, "ArchimedeDlg", false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) + : GEOMBase_Skeleton(theGeometryGUI, parent, "ArchimedeDlg", false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ARCHIMEDE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -70,6 +70,8 @@ OperationGUI_ArchimedeDlg::OperationGUI_ArchimedeDlg( GeometryGUI* theGeometryGU Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("archimede.htm"); + /* Initialisations */ Init(); } @@ -115,22 +117,18 @@ void OperationGUI_ArchimedeDlg::Init() connect(GroupPoints->LineEdit1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DZ, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DZ, SLOT(SetStep(double))); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), - SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), + this, SLOT(SelectionIntoArgument())); initName( tr( "GEOM_ARCHIMEDE" ) ); globalSelection( GEOM_ALLSHAPES ); SelectionIntoArgument(); - - /* displays Dialog */ - GroupPoints->show(); - this->show(); } @@ -208,7 +206,7 @@ void OperationGUI_ArchimedeDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); globalSelection( GEOM_ALLSHAPES ); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); return; } diff --git a/src/OperationGUI/OperationGUI_ArchimedeDlg.h b/src/OperationGUI/OperationGUI_ArchimedeDlg.h index f1c1fd7d7..f848d5e26 100644 --- a/src/OperationGUI/OperationGUI_ArchimedeDlg.h +++ b/src/OperationGUI/OperationGUI_ArchimedeDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : OperationGUI_ArchimedeDlg.h // Author : Nicolas REJNERI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_ARCHIMEDE_H #define DIALOGBOX_ARCHIMEDE_H @@ -42,13 +41,11 @@ class OperationGUI_ArchimedeDlg : public GEOMBase_Skeleton Q_OBJECT public: - OperationGUI_ArchimedeDlg( GeometryGUI* theGeometryGUI, QWidget* parent ); + OperationGUI_ArchimedeDlg(GeometryGUI* theGeometryGUI, QWidget* parent); ~OperationGUI_ArchimedeDlg(); protected: - // redefined from GEOMBase_Helper - virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& msg ); virtual bool execute( ObjectList& objects ); @@ -61,7 +58,6 @@ private: GEOM::GEOM_Object_var myShape; DlgRef_1Sel3Spin* GroupPoints; double myStep; - GeometryGUI* myGeometryGUI; private slots: void ClickOnOk(); diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.cxx b/src/OperationGUI/OperationGUI_ChamferDlg.cxx index 79678b359..fc2b12e96 100644 --- a/src/OperationGUI/OperationGUI_ChamferDlg.cxx +++ b/src/OperationGUI/OperationGUI_ChamferDlg.cxx @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : OperationGUI_ChamferDlg.cxx // Author : Damien COQUERET // Module : GEOM - // $Header$ #include "OperationGUI_ChamferDlg.h" @@ -51,9 +50,9 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -OperationGUI_ChamferDlg::OperationGUI_ChamferDlg( QWidget* parent ) -: GEOMBase_Skeleton(parent, "ChamferDlg", false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +OperationGUI_ChamferDlg::OperationGUI_ChamferDlg(GeometryGUI* theGeometryGUI, QWidget* parent) + : GEOMBase_Skeleton(theGeometryGUI, parent, "ChamferDlg", false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { myConstructorId = -1; @@ -149,6 +148,8 @@ OperationGUI_ChamferDlg::OperationGUI_ChamferDlg( QWidget* parent ) for ( anIter = mySpinBox.begin(); anIter != mySpinBox.end(); ++anIter ) anIter.data()->RangeStepAndValidator( 0.001, 999.999, SpecificStep, 3 ); + setHelpFileName("chamfer.htm"); + /* Initialisations */ Init(); } @@ -203,16 +204,14 @@ void OperationGUI_ChamferDlg::Init() this, SLOT( ValueChangedInSpinBox( double ) ) ); // selection - connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), - SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); + connect(myGeomGUI->getApp()->selectionMgr(), + SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); initName( tr( "GEOM_CHAMFER" ) ); myGrp2->hide(); myGrp3->hide(); myGrp1->show(); - - this->show(); } @@ -223,14 +222,14 @@ void OperationGUI_ChamferDlg::Init() void OperationGUI_ChamferDlg::ConstructorsClicked( int constructorId ) { // Activate next widget - if ( SUIT_Session::session()->activeApplication()->desktop()->activeWindow()->getViewManager()->getType() - != OCCViewer_Viewer::Type() ) - { - RadioButton1->setChecked( true ); - return; - } - - if ( myConstructorId == constructorId ) + if (myGeomGUI->getApp()->desktop()->activeWindow()->getViewManager()->getType() + != OCCViewer_Viewer::Type()) + { + RadioButton1->setChecked( true ); + return; + } + + if (myConstructorId == constructorId) return; // Get values from previous widget @@ -463,17 +462,6 @@ void OperationGUI_ChamferDlg::SetEditCurrentArgument() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void OperationGUI_ChamferDlg::DeactivateActiveDialog() -{ - // disconnect selection - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ActivateThisDialog() // purpose : diff --git a/src/OperationGUI/OperationGUI_ChamferDlg.h b/src/OperationGUI/OperationGUI_ChamferDlg.h index cb69ad24b..664e718be 100644 --- a/src/OperationGUI/OperationGUI_ChamferDlg.h +++ b/src/OperationGUI/OperationGUI_ChamferDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : OperationGUI_ChamferDlg.h // Author : Damien COQUERET // Module : GEOM -// $Header$ #ifndef DIALOGBOX_CHAMFER_H #define DIALOGBOX_CHAMFER_H @@ -46,8 +45,8 @@ class OperationGUI_ChamferDlg : public GEOMBase_Skeleton enum { SpinBox1, SpinBox21, SpinBox22, SpinBox31, SpinBox32 }; public: - OperationGUI_ChamferDlg( QWidget* parent ); - virtual ~OperationGUI_ChamferDlg(); + OperationGUI_ChamferDlg(GeometryGUI* theGeometryGUI, QWidget* parent); + virtual ~OperationGUI_ChamferDlg(); protected: // redefined from GEOMBase_Helper @@ -56,19 +55,16 @@ protected: virtual bool execute( ObjectList& objects ); private slots: - void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); void ValueChangedInSpinBox( double newValue ); void ConstructorsClicked( int constructorId ); -private : - +private: void Init(); void enterEvent( QEvent* e ); void reset(); @@ -78,7 +74,6 @@ private : void enableWidgets(); private: - int myConstructorId; GEOM::GEOM_Object_var myShape; @@ -95,4 +90,3 @@ private: }; #endif // DIALOGBOX_CHAMFER_H - diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.cxx b/src/OperationGUI/OperationGUI_ClippingDlg.cxx index 191eb88c2..221e1c073 100644 --- a/src/OperationGUI/OperationGUI_ClippingDlg.cxx +++ b/src/OperationGUI/OperationGUI_ClippingDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -33,6 +33,7 @@ #include "SUIT_ViewWindow.h" #include "SVTK_ViewWindow.h" #include "SVTK_ViewModel.h" + #include "OCCViewer_ViewWindow.h" #include "OCCViewer_ViewPort3d.h" @@ -50,6 +51,7 @@ #include // VTK Includes +#include "VTKViewer.h" #include #include @@ -57,12 +59,12 @@ // class : OperationGUI_ClippingDlg() // purpose : //================================================================================= -OperationGUI_ClippingDlg::OperationGUI_ClippingDlg( QWidget* parent, const char* name, bool modal, WFlags fl ) - : GEOMBase_Skeleton( parent, "OperationGUI_ClippingDlg", false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +OperationGUI_ClippingDlg::OperationGUI_ClippingDlg(GeometryGUI* theGeometryGUI, QWidget* parent) + : GEOMBase_Skeleton(theGeometryGUI, parent, "OperationGUI_ClippingDlg", false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { setCaption( tr( "Change clipping range" ) ); - + GroupConstructors->close(); GroupBoxName->close(); @@ -75,7 +77,7 @@ OperationGUI_ClippingDlg::OperationGUI_ClippingDlg( QWidget* parent, const char* GroupArgumentsLayout->setAlignment( Qt::AlignTop ); GroupArgumentsLayout->setSpacing( 6 ); GroupArgumentsLayout->setMargin( 11 ); - + // Controls TextLabelNear = new QLabel( GroupArguments, "TextLabelNear" ); TextLabelNear->setText( tr( "Near" ) ); @@ -89,10 +91,10 @@ OperationGUI_ClippingDlg::OperationGUI_ClippingDlg( QWidget* parent, const char* TextLabelFar->setText( tr( "Far" ) ); TextLabelFar->setFixedWidth(74); GroupArgumentsLayout->addWidget( TextLabelFar, 0, 2 ); - + SpinBox_Far = new DlgRef_SpinBox( GroupArguments, "SpinBox_Far"); GroupArgumentsLayout->addWidget( SpinBox_Far, 0, 3 ); - + resetButton = new QPushButton( GroupArguments, "resetButton" ); resetButton->setText( tr( "Reset" ) ); GroupArgumentsLayout->addWidget( resetButton, 0, 4 ); @@ -103,24 +105,20 @@ OperationGUI_ClippingDlg::OperationGUI_ClippingDlg( QWidget* parent, const char* TypeCB->insertItem(tr("FRONT")); TypeCB->insertItem(tr("SLICE")); GroupArgumentsLayout->addMultiCellWidget( TypeCB, 1, 1, 0, 4 ); - + Layout1->addWidget( GroupArguments, 2, 0 ); - + /* Initialisations */ SpinBox_Near->RangeStepAndValidator( -999999.999, +999999.999, 10.0, 3 ); SpinBox_Far->RangeStepAndValidator( -999999.999, +999999.999, 10.0, 3 ); - - //GeometryGUI* aGeomGUI = GeometryGUI::GetGeomGUI(); - + /* signals and slots connections */ - connect( buttonOk, SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) ); - connect( buttonCancel, SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) ) ; - connect( buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); - + connect( buttonOk , SIGNAL( clicked() ), this, SLOT( ClickOnOk() ) ); + connect( buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); + connect( resetButton, SIGNAL (clicked() ), this, SLOT( onReset() ) ) ; - - // connect( aGeomGUI, SIGNAL ( SignalDeactivateActiveDialog() ), this, SLOT( onDeactivate() ) ) ; - //connect( aGeomGUI, SIGNAL ( SignalCloseAllDialogs() ), this, SLOT( ClickOnCancel() ) ) ; + + setHelpFileName("none.htm"); Init(); } @@ -134,7 +132,6 @@ OperationGUI_ClippingDlg::~ OperationGUI_ClippingDlg() // no need to delete child widgets, Qt does it all for us } - //================================================================================= // function : Init() // purpose : @@ -171,7 +168,7 @@ void OperationGUI_ClippingDlg::Init() double position[3]; anActiveCamera->GetPosition(position); - float bounds[6]; + vtkFloatingPointType bounds[6]; aRenderer->ComputeVisiblePropBounds(bounds); double center[3]; @@ -187,7 +184,7 @@ void OperationGUI_ClippingDlg::Init() (position[1]-center[1])*(position[1]-center[1]) + (position[2]-center[2])*(position[2]-center[2])); - float range[2] = {distance - width/2.0, distance + width/2.0}; + vtkFloatingPointType range[2] = {distance - width/2.0, distance + width/2.0}; SpinBox_Near->SetValue(range[0]); SpinBox_Far->SetValue(range[1]); @@ -240,7 +237,7 @@ bool OperationGUI_ClippingDlg::ClickOnApply() return false; } - float range[2] = { SpinBox_Near->GetValue(), SpinBox_Far->GetValue() }; + vtkFloatingPointType range[2] = { SpinBox_Near->GetValue(), SpinBox_Far->GetValue() }; if (range[0] < 0.0) range[0] = 0.0; anActiveCamera->SetClippingRange( range ); @@ -274,17 +271,6 @@ void OperationGUI_ClippingDlg::ClickOnOk() ClickOnCancel(); } - -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void OperationGUI_ClippingDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : onActivate() // purpose : @@ -294,27 +280,16 @@ void OperationGUI_ClippingDlg::onActivate() GEOMBase_Skeleton::ActivateThisDialog(); } - -//================================================================================= -// function : onDeactivate() -// purpose : public slot to deactivate if active -//================================================================================= -void OperationGUI_ClippingDlg::DeactivateActiveDialog() -{ - return; -} - //================================================================================= // function : enterEvent() // purpose : //================================================================================= -void OperationGUI_ClippingDlg::enterEvent(QEvent* e) +void OperationGUI_ClippingDlg::enterEvent(QEvent*) { this->setEnabled(true); return; } - //================================================================================= // function : closeEvent // purpose : @@ -324,14 +299,14 @@ void OperationGUI_ClippingDlg::closeEvent( QCloseEvent* e ) QDialog::closeEvent( e ); } - //================================================================================= // function : onReset() // purpose : //================================================================================= void OperationGUI_ClippingDlg::onReset() { - SUIT_ViewWindow* anActiveWindow = SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); + SUIT_ViewWindow* anActiveWindow = + SUIT_Session::session()->activeApplication()->desktop()->activeWindow(); if (!anActiveWindow) return; @@ -356,7 +331,7 @@ void OperationGUI_ClippingDlg::onReset() double position[3]; anActiveCamera->GetPosition(position); - float bounds[6]; + vtkFloatingPointType bounds[6]; aRenderer->ComputeVisiblePropBounds(bounds); double center[3]; @@ -372,7 +347,7 @@ void OperationGUI_ClippingDlg::onReset() (position[1]-center[1])*(position[1]-center[1]) + (position[2]-center[2])*(position[2]-center[2])); - float range[2] = {distance - width/2.0, distance + width/2.0}; + vtkFloatingPointType range[2] = {distance - width/2.0, distance + width/2.0}; SpinBox_Near->SetValue(range[0]); SpinBox_Far->SetValue(range[1]); @@ -397,7 +372,5 @@ void OperationGUI_ClippingDlg::onReset() TypeCB->setCurrentItem(ztype); } - - return; } diff --git a/src/OperationGUI/OperationGUI_ClippingDlg.h b/src/OperationGUI/OperationGUI_ClippingDlg.h index ba5e6ee07..31215cfa6 100644 --- a/src/OperationGUI/OperationGUI_ClippingDlg.h +++ b/src/OperationGUI/OperationGUI_ClippingDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : OperationGUI_ClippingDlg.h // Author : Michael Zorin // Module : GEOM -// $Header: #ifndef DIALOGBOX_CLIPPINGRANGE_H #define DIALOGBOX_CLIPPING_H @@ -46,20 +45,19 @@ enum ViewerTypes { VTK, OCC, OTHER }; class OperationGUI_ClippingDlg : public GEOMBase_Skeleton { Q_OBJECT - - public: - OperationGUI_ClippingDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + +public: + OperationGUI_ClippingDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0); ~OperationGUI_ClippingDlg(); - -private : +private: void Init(); ViewerTypes myViewerType; virtual void closeEvent( QCloseEvent* e ); void enterEvent(QEvent* e); - + QGroupBox* GroupArguments; QLabel* TextLabelNear; DlgRef_SpinBox* SpinBox_Near; @@ -71,10 +69,7 @@ private : private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void onActivate(); - void DeactivateActiveDialog(); - void onReset(); }; diff --git a/src/OperationGUI/OperationGUI_FilletDlg.cxx b/src/OperationGUI/OperationGUI_FilletDlg.cxx index 583aad057..d512a33b4 100644 --- a/src/OperationGUI/OperationGUI_FilletDlg.cxx +++ b/src/OperationGUI/OperationGUI_FilletDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -51,19 +51,20 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -OperationGUI_FilletDlg::OperationGUI_FilletDlg( QWidget* parent ) - :GEOMBase_Skeleton( parent, "OperationGUI_FilletDlg", false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +OperationGUI_FilletDlg::OperationGUI_FilletDlg(GeometryGUI* theGeometryGUI, QWidget* parent) + :GEOMBase_Skeleton(theGeometryGUI, parent, "OperationGUI_FilletDlg", false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { myConstructorId = -1; - - QPixmap image0( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_FILLET_ALL" ) ) ); - QPixmap image1( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_FILLET_EDGE" ) ) ); - QPixmap image2( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_DLG_FILLET_FACE" ) ) ); - - QPixmap iconSelect( SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM", tr( "ICON_SELECT" ) ) ); - setCaption( tr( "GEOM_FILLET_TITLE" ) ); + SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr(); + QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_FILLET_ALL"))); + QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_FILLET_EDGE"))); + QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_FILLET_FACE"))); + + QPixmap iconSelect(aResMgr->loadPixmap("GEOM", tr("ICON_SELECT"))); + + setCaption(tr("GEOM_FILLET_TITLE")); /***************************************************************/ GroupConstructors->setTitle( tr( "GEOM_FILLET" ) ); @@ -108,6 +109,8 @@ OperationGUI_FilletDlg::OperationGUI_FilletDlg( QWidget* parent ) Group2->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, SpecificStep, 3); Group3->SpinBox_DX->RangeStepAndValidator(0.001, 999.999, SpecificStep, 3); + setHelpFileName("fillet.htm"); + /* Initialisations */ Init(); } @@ -158,17 +161,14 @@ void OperationGUI_FilletDlg::Init() connect(Group3->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); // selection - connect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), - SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); - + connect(myGeomGUI->getApp()->selectionMgr(), + SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); initName( tr( "GEOM_FILLET" ) ); Group2->hide(); Group3->hide(); Group1->show(); - - this->show(); } @@ -308,31 +308,31 @@ void OperationGUI_FilletDlg::SelectionIntoArgument() if ( aResult && !anObj->_is_nil() ) { - TColStd_IndexedMapOfInteger anIndexes; - ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( firstIObject(), anIndexes ); - - if ( anIndexes.Extent() > 0 ) - { - QString aName; - if ( anIndexes.Extent() == 1 ) - { - int anIndex = anIndexes( 1 ); - - aName = QString( GEOMBase::GetName( anObj ) ) + QString( ":%1" ).arg( anIndex ); - } - else - aName = tr( "GEOM_MEN_POPUP_NAME" ).arg( anIndexes.Extent() ); - - myEditCurrentArgument->setText( aName ); - - if ( myConstructorId == 1 ) - myEdges = anIndexes; - else - myFaces = anIndexes; - - displayPreview(); - return; - } + TColStd_IndexedMapOfInteger anIndexes; + myGeomGUI->getApp()->selectionMgr()->GetIndexes( firstIObject(), anIndexes ); + + if ( anIndexes.Extent() > 0 ) + { + QString aName; + if ( anIndexes.Extent() == 1 ) + { + int anIndex = anIndexes( 1 ); + + aName = QString( GEOMBase::GetName( anObj ) ) + QString( ":%1" ).arg( anIndex ); + } + else + aName = tr( "GEOM_MEN_POPUP_NAME" ).arg( anIndexes.Extent() ); + + myEditCurrentArgument->setText( aName ); + + if ( myConstructorId == 1 ) + myEdges = anIndexes; + else + myFaces = anIndexes; + + displayPreview(); + return; + } } } myFaces.Clear(); @@ -400,17 +400,6 @@ void OperationGUI_FilletDlg::SetEditCurrentArgument() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void OperationGUI_FilletDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); - return; -} - - //================================================================================= // function : ActivateThisDialog() // purpose : @@ -419,8 +408,8 @@ void OperationGUI_FilletDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), - SIGNAL(currentSelectionChanged()), this, SLOT( SelectionIntoArgument() ) ); + connect(myGeomGUI->getApp()->selectionMgr(), + SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); activateSelection(); displayPreview(); @@ -626,10 +615,3 @@ double OperationGUI_FilletDlg::getRadius() const else if ( anId == 1 ) return Group2->SpinBox_DX->GetValue(); else return Group3->SpinBox_DX->GetValue(); } - - - - - - - diff --git a/src/OperationGUI/OperationGUI_FilletDlg.h b/src/OperationGUI/OperationGUI_FilletDlg.h index d794e834d..ab55f1469 100644 --- a/src/OperationGUI/OperationGUI_FilletDlg.h +++ b/src/OperationGUI/OperationGUI_FilletDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : OperationGUI_FilletDlg.h // Author : Damien COQUERET // Module : GEOM -// $Header$ #ifndef DIALOGBOX_FILLET_H #define DIALOGBOX_FILLET_H @@ -45,8 +44,8 @@ class OperationGUI_FilletDlg : public GEOMBase_Skeleton Q_OBJECT public: - OperationGUI_FilletDlg( QWidget* parent ); - ~OperationGUI_FilletDlg(); + OperationGUI_FilletDlg(GeometryGUI* theGeometryGUI, QWidget* parent); + ~OperationGUI_FilletDlg(); protected: // redefined from GEOMBase_Helper @@ -55,19 +54,16 @@ protected: virtual bool execute( ObjectList& objects ); private slots: - void ClickOnOk(); bool ClickOnApply(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); void ValueChangedInSpinBox( double newValue ); void ConstructorsClicked( int constructorId ); -private : - +private: void Init(); void enterEvent( QEvent* e ); void reset(); @@ -76,18 +72,16 @@ private : void enableWidgets(); double getRadius() const; -private : - +private: int myConstructorId; GEOM::GEOM_Object_var myShape; TColStd_IndexedMapOfInteger myEdges; TColStd_IndexedMapOfInteger myFaces; - + DlgRef_1Sel1Spin* Group1; DlgRef_2Sel1Spin* Group2; DlgRef_2Sel1Spin* Group3; }; #endif // DIALOGBOX_FILLET_H - diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.cxx b/src/OperationGUI/OperationGUI_MaterialDlg.cxx index b3055d38d..5f0c9a25e 100644 --- a/src/OperationGUI/OperationGUI_MaterialDlg.cxx +++ b/src/OperationGUI/OperationGUI_MaterialDlg.cxx @@ -16,7 +16,7 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -47,15 +47,16 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -OperationGUI_MaterialDlg::OperationGUI_MaterialDlg (QWidget* parent, const char* name, - GEOM::ListOfGO ListShapes, +OperationGUI_MaterialDlg::OperationGUI_MaterialDlg (GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, GEOM::ListOfGO ListShapes, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { myListShapes = ListShapes; myParentDlg = parent; - QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PARTITION"))); + QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PARTITION"))); setCaption(tr("GEOM_MATERIAL_TITLE")); @@ -71,17 +72,19 @@ OperationGUI_MaterialDlg::OperationGUI_MaterialDlg (QWidget* parent, const char* myShapeCol = GroupPoints->ListView1->addColumn(tr("GEOM_MATERIAL_SHAPE")); myMaterCol = GroupPoints->ListView1->addColumn(tr("GEOM_MATERIAL_MATERIAL")); GroupPoints->ListView1->setSelectionMode(QListView::Extended); + GroupPoints->ListView1->setSorting(-1); GroupPoints->TextLabel1->setText(tr("GEOM_MATERIAL_ID")); GroupPoints->PushButton1->setText(tr("GEOM_MATERIAL_SET")); Layout1->addWidget(GroupPoints, 1, 0); /***************************************************************/ - + + setHelpFileName("none.htm"); + Init(); } - //================================================================================= // function : ~OperationGUI_MaterialDlg() // purpose : Destroys the object and frees any allocated resources @@ -91,7 +94,6 @@ OperationGUI_MaterialDlg::~OperationGUI_MaterialDlg() // no need to delete child widgets, Qt does it all for us } - //================================================================================= // function : Init() // purpose : @@ -103,10 +105,11 @@ void OperationGUI_MaterialDlg::Init() dynamic_cast(myParentDlg); if (aParentDlg) myListMaterials = aParentDlg->GetListMaterials(); - + /* list filling */ MESSAGE("Filling list with " << myListShapes.length() << " objects"); QString aMaterialId; + QListViewItem *anItem = NULL; for (int ind = 0; ind < myListShapes.length(); ind++) { GEOM::GEOM_Object_var anObject = myListShapes[ind]; if (!anObject->_is_nil()) { @@ -115,8 +118,14 @@ void OperationGUI_MaterialDlg::Init() aMaterialId = QString::number(myListMaterials[ind]); else aMaterialId = "0"; - QListViewItem* aItem = - new QListViewItem(GroupPoints->ListView1, GEOMBase::GetName( anObject ), aMaterialId); + if (anItem) + // insert after aPrevItem + anItem = new QListViewItem(GroupPoints->ListView1, anItem, + GEOMBase::GetName( anObject ), aMaterialId); + else + // the first item creation + anItem = new QListViewItem(GroupPoints->ListView1, + GEOMBase::GetName( anObject ), aMaterialId); } } MESSAGE("Filled"); @@ -128,20 +137,8 @@ void OperationGUI_MaterialDlg::Init() connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetMaterial())); -// connect(GroupPoints->ListView1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); -// connect(GroupPoints->SpinBox1, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - - /* displays Dialog */ - MESSAGE("GroupPoints->show() ..."); - GroupPoints->show(); - MESSAGE("this->show() ..."); - this->show(); - MESSAGE("return"); - - return; } @@ -182,17 +179,17 @@ void OperationGUI_MaterialDlg::ClickOnOk() //================================================================================= void OperationGUI_MaterialDlg::SelectionIntoArgument() { - QString aString = ""; /* name of selection */ + /*QString aString = ""; // name of selection - int nbSel = myGeomBase->GetNameOfSelectedIObjects(selectedIO(), aString); - if(nbSel < 1) { + int nbSel = GEOMBase::GetNameOfSelectedIObjects(selectedIO(), aString); + if (nbSel < 1) { return; } //myGeomBase->ConvertListOfIOInListOfIOR(selectedIO(), myListShapes); - /* no simulation */ - return; + // no simulation + return;*/ } @@ -233,6 +230,6 @@ void OperationGUI_MaterialDlg::ActivateThisDialog() //================================================================================= void OperationGUI_MaterialDlg::enterEvent(QEvent* e) { - if(!GroupConstructors->isEnabled()) + if (!GroupConstructors->isEnabled()) this->ActivateThisDialog(); } diff --git a/src/OperationGUI/OperationGUI_MaterialDlg.h b/src/OperationGUI/OperationGUI_MaterialDlg.h index a57dfe514..39111f553 100644 --- a/src/OperationGUI/OperationGUI_MaterialDlg.h +++ b/src/OperationGUI/OperationGUI_MaterialDlg.h @@ -16,14 +16,13 @@ // 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.salome-platform.org or email : webmaster.salome@opencascade.org +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : OperationGUI_MaterialDlg.h // Author : Julia DOROVSKIKH // Module : GEOM -// $Header$ #ifndef DIALOGBOX_MATERIAL_H #define DIALOGBOX_MATERIAL_H @@ -41,8 +40,8 @@ class OperationGUI_MaterialDlg : public GEOMBase_Skeleton Q_OBJECT public: - OperationGUI_MaterialDlg (QWidget* parent, const char* name, - GEOM::ListOfGO ListShapes, + OperationGUI_MaterialDlg (GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, GEOM::ListOfGO ListShapes, bool modal = FALSE, WFlags fl = 0); ~OperationGUI_MaterialDlg(); @@ -52,8 +51,8 @@ private: QWidget* myParentDlg; - GEOM::ListOfGO myListShapes; - GEOM::ListOfLong myListMaterials; + GEOM::ListOfGO myListShapes; + GEOM::ListOfLong myListMaterials; DlgRef_1List1Spin1Btn_QTD* GroupPoints; @@ -65,7 +64,6 @@ private slots: void ActivateThisDialog(); void SelectionIntoArgument(); void SetMaterial(); - }; #endif // DIALOGBOX_MATERIAL_H diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.cxx b/src/OperationGUI/OperationGUI_PartitionDlg.cxx index 9315616f4..5f393aa2e 100644 --- a/src/OperationGUI/OperationGUI_PartitionDlg.cxx +++ b/src/OperationGUI/OperationGUI_PartitionDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -49,12 +49,14 @@ // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -OperationGUI_PartitionDlg::OperationGUI_PartitionDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +OperationGUI_PartitionDlg::OperationGUI_PartitionDlg(GeometryGUI* theGeometryGUI, QWidget* parent) + :GEOMBase_Skeleton(theGeometryGUI, parent, "OperationGUI_PartitionDlg", false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PARTITION"))); - QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_PARTITION_PLANE"))); - QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); + SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr(); + QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PARTITION"))); + QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_PARTITION_PLANE"))); + QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT"))); setCaption(tr("GEOM_PARTITION_TITLE")); @@ -86,6 +88,8 @@ OperationGUI_PartitionDlg::OperationGUI_PartitionDlg(QWidget* parent, const char Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + + setHelpFileName("partition.htm"); Init(); } @@ -135,7 +139,7 @@ void OperationGUI_PartitionDlg::Init() connect(GroupPoints->ComboBox1, SIGNAL(activated(int)), this, SLOT(ComboTextChanged())); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); initName( tr( "GEOM_PARTITION" ) ); @@ -149,7 +153,7 @@ void OperationGUI_PartitionDlg::Init() //================================================================================= void OperationGUI_PartitionDlg::ConstructorsClicked(int constructorId) { - disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0); + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); globalSelection(); myListShapes.length(0); @@ -186,14 +190,14 @@ void OperationGUI_PartitionDlg::ConstructorsClicked(int constructorId) break; } } - + myEditCurrentArgument = GroupPoints->LineEdit1; GroupPoints->LineEdit1->clear(); GroupPoints->LineEdit2->clear(); onRemoveWebs(false); myEditCurrentArgument->setFocus(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); MESSAGE(width()<<" "<LineEdit1 || send == GroupPoints->LineEdit2 || send == GroupPoints->LineEdit3 || @@ -353,30 +347,20 @@ void OperationGUI_PartitionDlg::LineEditReturnPressed() void OperationGUI_PartitionDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); ConstructorsClicked( getConstructorId() ); } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void OperationGUI_PartitionDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : enterEvent() // purpose : //================================================================================= void OperationGUI_PartitionDlg::enterEvent(QEvent* e) { - if(!GroupConstructors->isEnabled()) + if (!GroupConstructors->isEnabled()) this->ActivateThisDialog(); } @@ -397,8 +381,8 @@ GEOM::GEOM_IOperations_ptr OperationGUI_PartitionDlg::createOperation() //================================================================================= bool OperationGUI_PartitionDlg::isValid( QString& msg ) { - return (myListShapes.length() || myListTools.length() || - myListKeepInside.length() || myListRemoveInside.length()); + return (myListShapes.length() || myListTools.length() || + myListKeepInside.length() || myListRemoveInside.length()); } @@ -409,35 +393,30 @@ bool OperationGUI_PartitionDlg::isValid( QString& msg ) bool OperationGUI_PartitionDlg::execute( ObjectList& objects ) { bool res = false; - + GEOM::GEOM_Object_var anObj; QString msg; - + int aLimit = GetLimit(); int aConstructorId = getConstructorId(); - - if (aConstructorId==1) + + if (aConstructorId == 1) aLimit = GEOM::SHAPE; - - if (isValid( msg )) - { - - if ( aConstructorId==0 && !toRemoveWebs() ) - myListMaterials.length(0); - - anObj = GEOM::GEOM_IBooleanOperations::_narrow( getOperation() )->MakePartition(myListShapes, - myListTools, - myListKeepInside, - myListRemoveInside, - aLimit, - toRemoveWebs(), - myListMaterials); - res = true; - } - - if ( !anObj->_is_nil() ) + + if (isValid( msg )) { + if (aConstructorId == 0 && !toRemoveWebs()) + myListMaterials.length(0); + + anObj = GEOM::GEOM_IBooleanOperations::_narrow(getOperation())-> + MakePartition(myListShapes, myListTools, + myListKeepInside, myListRemoveInside, + aLimit, toRemoveWebs(), myListMaterials); + res = true; + } + + if (!anObj->_is_nil()) objects.push_back( anObj._retn() ); - + return res; } @@ -456,7 +435,6 @@ void OperationGUI_PartitionDlg::closeEvent( QCloseEvent* e ) //function : ComboTextChanged //purpose : //======================================================================= - void OperationGUI_PartitionDlg::ComboTextChanged() { bool IsEnabled = GroupPoints->ComboBox1->currentItem() < 3; @@ -475,11 +453,9 @@ void OperationGUI_PartitionDlg::ComboTextChanged() //================================================================================= void OperationGUI_PartitionDlg::SetMaterials() { - MESSAGE("OperationGUI_MaterialDlg ..."); - OperationGUI_MaterialDlg *aDlg = - new OperationGUI_MaterialDlg(this, "", myListShapes, true); - MESSAGE("OperationGUI_MaterialDlg"); - return; + OperationGUI_MaterialDlg* aDlg = + new OperationGUI_MaterialDlg(myGeomGUI, this, "", myListShapes, true); + aDlg->show(); } @@ -513,42 +489,17 @@ bool OperationGUI_PartitionDlg::toRemoveWebs() const int OperationGUI_PartitionDlg::GetLimit() const { int aLimit = GroupPoints->ComboBox1->currentItem(); - + switch(aLimit) - { - case 0 : - { - aLimit = GEOM::SOLID; - break; - } - case 1 : - { - aLimit = GEOM::SHELL; - break; - } - case 2 : - { - aLimit = GEOM::FACE; - break; - } - case 3 : - { - aLimit = GEOM::WIRE; - break; - } - case 4 : - { - aLimit = GEOM::EDGE; - break; - } - case 5 : - { - aLimit = GEOM::VERTEX; - break; - } - default : - aLimit = GEOM::SHAPE; - } - + { + case 0: aLimit = GEOM::SOLID ; break; + case 1: aLimit = GEOM::SHELL ; break; + case 2: aLimit = GEOM::FACE ; break; + case 3: aLimit = GEOM::WIRE ; break; + case 4: aLimit = GEOM::EDGE ; break; + case 5: aLimit = GEOM::VERTEX; break; + default: aLimit = GEOM::SHAPE ; + } + return aLimit; } diff --git a/src/OperationGUI/OperationGUI_PartitionDlg.h b/src/OperationGUI/OperationGUI_PartitionDlg.h index 1599bf1a8..5a95b5d9b 100644 --- a/src/OperationGUI/OperationGUI_PartitionDlg.h +++ b/src/OperationGUI/OperationGUI_PartitionDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : OperationGUI_PartitionDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_PARTITION_H #define DIALOGBOX_PARTITION_H @@ -32,7 +31,6 @@ #include "GEOMBase_Skeleton.h" #include "DlgRef_4Sel1List1Check_QTD.h" - //================================================================================= // class : OperationGUI_PartitionDlg // purpose : @@ -42,7 +40,7 @@ class OperationGUI_PartitionDlg : public GEOMBase_Skeleton Q_OBJECT public: - OperationGUI_PartitionDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + OperationGUI_PartitionDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0); ~OperationGUI_PartitionDlg(); void SetListMaterials(GEOM::ListOfLong ListMaterials) @@ -64,21 +62,19 @@ private: void enterEvent(QEvent* e); bool toRemoveWebs() const; int GetLimit() const; - - GEOM::ListOfGO myListShapes; - GEOM::ListOfLong myListMaterials; - GEOM::ListOfGO myListTools; - GEOM::ListOfGO myListRemoveInside; - GEOM::ListOfGO myListKeepInside; - + + GEOM::ListOfGO myListShapes; + GEOM::ListOfLong myListMaterials; + GEOM::ListOfGO myListTools; + GEOM::ListOfGO myListRemoveInside; + GEOM::ListOfGO myListKeepInside; + DlgRef_4Sel1List1Check_QTD* GroupPoints; private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); diff --git a/src/PARTITION/Makefile.in b/src/PARTITION/Makefile.in index 76de606eb..74a06a7fd 100644 --- a/src/PARTITION/Makefile.in +++ b/src/PARTITION/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -53,9 +53,9 @@ EXPORT_HEADERS = Partition_Spliter.hxx \ EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_LDPATH) -lTKBool -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_LDPATH) -lTKBool $(KERNEL_LDFLAGS) %_moc.cxx: %.h $(MOC) $< -o $@ diff --git a/src/PARTITION/Partition.cdl b/src/PARTITION/Partition.cdl index 179b425e8..0c1c5179c 100644 --- a/src/PARTITION/Partition.cdl +++ b/src/PARTITION/Partition.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- GEOM PARTITION : partition algorithm -- @@ -36,7 +36,7 @@ -- 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 +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -- -- -- diff --git a/src/PARTITION/Partition_Inter2d.cdl b/src/PARTITION/Partition_Inter2d.cdl index 55b69124f..371186e58 100644 --- a/src/PARTITION/Partition_Inter2d.cdl +++ b/src/PARTITION/Partition_Inter2d.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- GEOM PARTITION : partition algorithm -- @@ -36,7 +36,7 @@ -- 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 +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -- -- -- diff --git a/src/PARTITION/Partition_Inter2d.cxx b/src/PARTITION/Partition_Inter2d.cxx index ab62aaadf..2760b23e6 100644 --- a/src/PARTITION/Partition_Inter2d.cxx +++ b/src/PARTITION/Partition_Inter2d.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Inter2d.hxx b/src/PARTITION/Partition_Inter2d.hxx index 059be9613..da882ca07 100644 --- a/src/PARTITION/Partition_Inter2d.hxx +++ b/src/PARTITION/Partition_Inter2d.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Inter2d.ixx b/src/PARTITION/Partition_Inter2d.ixx index 963d1ec17..3725060ed 100644 --- a/src/PARTITION/Partition_Inter2d.ixx +++ b/src/PARTITION/Partition_Inter2d.ixx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Inter2d.jxx b/src/PARTITION/Partition_Inter2d.jxx index 8c3ef7d49..944b3a55c 100644 --- a/src/PARTITION/Partition_Inter2d.jxx +++ b/src/PARTITION/Partition_Inter2d.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Inter3d.cdl b/src/PARTITION/Partition_Inter3d.cdl index 578161a25..fbbfd63fb 100644 --- a/src/PARTITION/Partition_Inter3d.cdl +++ b/src/PARTITION/Partition_Inter3d.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- GEOM PARTITION : partition algorithm -- @@ -36,7 +36,7 @@ -- 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 +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -- -- -- diff --git a/src/PARTITION/Partition_Inter3d.cxx b/src/PARTITION/Partition_Inter3d.cxx index 2c22d6ea6..771fc19d1 100644 --- a/src/PARTITION/Partition_Inter3d.cxx +++ b/src/PARTITION/Partition_Inter3d.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Inter3d.hxx b/src/PARTITION/Partition_Inter3d.hxx index 57e8da43f..bb2b43106 100644 --- a/src/PARTITION/Partition_Inter3d.hxx +++ b/src/PARTITION/Partition_Inter3d.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Inter3d.ixx b/src/PARTITION/Partition_Inter3d.ixx index 0775cc99c..438ff8665 100644 --- a/src/PARTITION/Partition_Inter3d.ixx +++ b/src/PARTITION/Partition_Inter3d.ixx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Inter3d.jxx b/src/PARTITION/Partition_Inter3d.jxx index 5804ba81e..90453e547 100644 --- a/src/PARTITION/Partition_Inter3d.jxx +++ b/src/PARTITION/Partition_Inter3d.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Loop.cdl b/src/PARTITION/Partition_Loop.cdl index 8678d2f19..c474632b3 100644 --- a/src/PARTITION/Partition_Loop.cdl +++ b/src/PARTITION/Partition_Loop.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- GEOM PARTITION : partition algorithm -- @@ -36,7 +36,7 @@ -- 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 +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -- -- -- diff --git a/src/PARTITION/Partition_Loop.cxx b/src/PARTITION/Partition_Loop.cxx index 0ab037805..f118f857d 100644 --- a/src/PARTITION/Partition_Loop.cxx +++ b/src/PARTITION/Partition_Loop.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Loop.hxx b/src/PARTITION/Partition_Loop.hxx index 9e9226d9d..52f2629ca 100644 --- a/src/PARTITION/Partition_Loop.hxx +++ b/src/PARTITION/Partition_Loop.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Loop.ixx b/src/PARTITION/Partition_Loop.ixx index 1c40e7254..64eb2d66b 100644 --- a/src/PARTITION/Partition_Loop.ixx +++ b/src/PARTITION/Partition_Loop.ixx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Loop.jxx b/src/PARTITION/Partition_Loop.jxx index dd86f05c3..c23bd5206 100644 --- a/src/PARTITION/Partition_Loop.jxx +++ b/src/PARTITION/Partition_Loop.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Loop2d.cdl b/src/PARTITION/Partition_Loop2d.cdl index 94d0e7e4a..dfdf62504 100644 --- a/src/PARTITION/Partition_Loop2d.cdl +++ b/src/PARTITION/Partition_Loop2d.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- GEOM PARTITION : partition algorithm -- diff --git a/src/PARTITION/Partition_Loop2d.cxx b/src/PARTITION/Partition_Loop2d.cxx index d280a7858..731728778 100644 --- a/src/PARTITION/Partition_Loop2d.cxx +++ b/src/PARTITION/Partition_Loop2d.cxx @@ -1,8 +1,23 @@ -// GEOM PARTITION : partition algorithm +// Copyright (C) 2005 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. // -// Copyright (C) 2003 CEA/DEN, EDF R& D +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// GEOM PARTITION : partition algorithm // // File : Partition_Loop2d.cxx // Author : Benedicte MARTIN diff --git a/src/PARTITION/Partition_Loop2d.hxx b/src/PARTITION/Partition_Loop2d.hxx index 2310e1581..eaba040f3 100644 --- a/src/PARTITION/Partition_Loop2d.hxx +++ b/src/PARTITION/Partition_Loop2d.hxx @@ -1,8 +1,23 @@ -// GEOM PARTITION : partition algorithm +// Copyright (C) 2005 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. // -// Copyright (C) 2003 CEA/DEN, EDF R&D +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// GEOM PARTITION : partition algorithm // // File : Partition_Loop2d.hxx // Module : GEOM diff --git a/src/PARTITION/Partition_Loop2d.ixx b/src/PARTITION/Partition_Loop2d.ixx index 2d35fd5c7..1868d7d4b 100644 --- a/src/PARTITION/Partition_Loop2d.ixx +++ b/src/PARTITION/Partition_Loop2d.ixx @@ -1,11 +1,21 @@ -// GEOM PARTITION : partition algorithm +// Copyright (C) 2005 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. // -// Copyright (C) 2003 CEA/DEN, EDF R&D +// 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 // -// -// -// File : Partition_Loop2d.ixx -// Module : GEOM +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "Partition_Loop2d.jxx" diff --git a/src/PARTITION/Partition_Loop2d.jxx b/src/PARTITION/Partition_Loop2d.jxx index 555c16c80..b4127d344 100644 --- a/src/PARTITION/Partition_Loop2d.jxx +++ b/src/PARTITION/Partition_Loop2d.jxx @@ -1,11 +1,21 @@ -// GEOM PARTITION : partition algorithm +// Copyright (C) 2005 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. // -// Copyright (C) 2003 CEA/DEN, EDF R&D +// 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 // -// -// -// File : Partition_Loop2d.jxx -// Module : GEOM +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _TopoDS_Face_HeaderFile #include diff --git a/src/PARTITION/Partition_Loop3d.cdl b/src/PARTITION/Partition_Loop3d.cdl index 62e6af3ce..7b2262256 100644 --- a/src/PARTITION/Partition_Loop3d.cdl +++ b/src/PARTITION/Partition_Loop3d.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- GEOM PARTITION : partition algorithm -- diff --git a/src/PARTITION/Partition_Loop3d.cxx b/src/PARTITION/Partition_Loop3d.cxx index c93a75108..4d83a4616 100644 --- a/src/PARTITION/Partition_Loop3d.cxx +++ b/src/PARTITION/Partition_Loop3d.cxx @@ -1,8 +1,23 @@ -// GEOM PARTITION : partition algorithm +// Copyright (C) 2005 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. // -// Copyright (C) 2003 CEA/DEN, EDF R&D +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// GEOM PARTITION : partition algorithm // // File : Partition_Loop3d.cxx // Module : GEOM diff --git a/src/PARTITION/Partition_Loop3d.hxx b/src/PARTITION/Partition_Loop3d.hxx index b946b32df..38be1c3ee 100644 --- a/src/PARTITION/Partition_Loop3d.hxx +++ b/src/PARTITION/Partition_Loop3d.hxx @@ -1,8 +1,23 @@ -// GEOM PARTITION : partition algorithm +// Copyright (C) 2005 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. // -// Copyright (C) 2003 CEA/DEN, EDF R&D +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// GEOM PARTITION : partition algorithm // // File : Partition_Loop3d.hxx // Module : GEOM diff --git a/src/PARTITION/Partition_Loop3d.ixx b/src/PARTITION/Partition_Loop3d.ixx index a661b3242..75c6f942a 100644 --- a/src/PARTITION/Partition_Loop3d.ixx +++ b/src/PARTITION/Partition_Loop3d.ixx @@ -1,11 +1,21 @@ -// GEOM PARTITION : partition algorithm +// Copyright (C) 2005 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. // -// Copyright (C) 2003 CEA/DEN, EDF R&D +// 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 // -// -// -// File : Partition_Loop3d.ixx -// Module : GEOM +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #include "Partition_Loop3d.jxx" diff --git a/src/PARTITION/Partition_Loop3d.jxx b/src/PARTITION/Partition_Loop3d.jxx index 9b654f41b..9a6f3efaa 100644 --- a/src/PARTITION/Partition_Loop3d.jxx +++ b/src/PARTITION/Partition_Loop3d.jxx @@ -1,11 +1,21 @@ -// GEOM PARTITION : partition algorithm +// Copyright (C) 2005 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. // -// Copyright (C) 2003 CEA/DEN, EDF R&D +// 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 // -// -// -// File : Partition_Loop3d.jxx -// Module : GEOM +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com #ifndef _TopoDS_Shape_HeaderFile #include diff --git a/src/PARTITION/Partition_Spliter.cdl b/src/PARTITION/Partition_Spliter.cdl index acef3db6a..4d742be40 100644 --- a/src/PARTITION/Partition_Spliter.cdl +++ b/src/PARTITION/Partition_Spliter.cdl @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -- GEOM PARTITION : partition algorithm -- @@ -36,7 +36,7 @@ -- 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 +-- See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -- -- -- diff --git a/src/PARTITION/Partition_Spliter.cxx b/src/PARTITION/Partition_Spliter.cxx index 4c79bf922..1bb919fe5 100644 --- a/src/PARTITION/Partition_Spliter.cxx +++ b/src/PARTITION/Partition_Spliter.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Spliter.hxx b/src/PARTITION/Partition_Spliter.hxx index 2f9e102bb..04b60c0de 100644 --- a/src/PARTITION/Partition_Spliter.hxx +++ b/src/PARTITION/Partition_Spliter.hxx @@ -1,8 +1,23 @@ -// GEOM PARTITION : partition algorithm +// Copyright (C) 2005 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. // -// Copyright (C) 2003 CEA/DEN, EDF R&D +// 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.salome-platform.org/ or email : webmaster.salome@opencascade.com // +// GEOM PARTITION : partition algorithm // // File : Partition_Spliter.hxx // Module : GEOM diff --git a/src/PARTITION/Partition_Spliter.ixx b/src/PARTITION/Partition_Spliter.ixx index ee8259468..cd1c199c5 100644 --- a/src/PARTITION/Partition_Spliter.ixx +++ b/src/PARTITION/Partition_Spliter.ixx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PARTITION/Partition_Spliter.jxx b/src/PARTITION/Partition_Spliter.jxx index bf8622c93..f89faca05 100644 --- a/src/PARTITION/Partition_Spliter.jxx +++ b/src/PARTITION/Partition_Spliter.jxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PrimitiveGUI/Makefile.in b/src/PrimitiveGUI/Makefile.in index deac5e77e..b56bbab13 100644 --- a/src/PrimitiveGUI/Makefile.in +++ b/src/PrimitiveGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -60,8 +60,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase diff --git a/src/PrimitiveGUI/PrimitiveGUI.cxx b/src/PrimitiveGUI/PrimitiveGUI.cxx index 49448108f..218c832e6 100644 --- a/src/PrimitiveGUI/PrimitiveGUI.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PrimitiveGUI/PrimitiveGUI.h b/src/PrimitiveGUI/PrimitiveGUI.h index ce0b00d77..9bdef3508 100644 --- a/src/PrimitiveGUI/PrimitiveGUI.h +++ b/src/PrimitiveGUI/PrimitiveGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx index ea44ad1bc..28e59287c 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -49,8 +49,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -PrimitiveGUI_BoxDlg::PrimitiveGUI_BoxDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +PrimitiveGUI_BoxDlg::PrimitiveGUI_BoxDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BOX_2P"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM", tr("ICON_DLG_BOX_DXYZ"))); @@ -80,6 +82,8 @@ PrimitiveGUI_BoxDlg::PrimitiveGUI_BoxDlg(GeometryGUI* theGeometryGUI, QWidget* p Layout1->addWidget(GroupPoints, 2, 0); Layout1->addWidget(GroupDimensions, 2, 0); /***************************************************************/ + + setHelpFileName("box.htm"); Init(); } @@ -125,6 +129,7 @@ void PrimitiveGUI_BoxDlg::Init() /* signals and slots connections */ connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); + connect(GroupConstructors, SIGNAL(clicked(int)), this, SLOT(ConstructorsClicked(int))); connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); @@ -137,9 +142,9 @@ void PrimitiveGUI_BoxDlg::Init() connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double))); connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); @@ -215,16 +220,6 @@ bool PrimitiveGUI_BoxDlg::ClickOnApply() } -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void PrimitiveGUI_BoxDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed @@ -323,16 +318,6 @@ void PrimitiveGUI_BoxDlg::enterEvent(QEvent* e) } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void PrimitiveGUI_BoxDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ValueChangedInSpinBox() // purpose : diff --git a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h index 51d8ecedd..9e7139889 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_BoxDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : PrimitiveGUI_BoxDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_BOX_H #define DIALOGBOX_BOX_H @@ -43,8 +42,9 @@ class PrimitiveGUI_BoxDlg : public GEOMBase_Skeleton { Q_OBJECT - public: - PrimitiveGUI_BoxDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); +public: + PrimitiveGUI_BoxDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~PrimitiveGUI_BoxDlg(); protected: @@ -59,8 +59,6 @@ private : void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint1, myPoint2; /* Points containing the vector */ DlgRef_2Sel_QTD* GroupPoints; @@ -69,15 +67,12 @@ private : private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); void ConstructorsClicked(int); void ValueChangedInSpinBox(); - }; #endif // DIALOGBOX_BOX_H diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx index 45db91182..cd250f830 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -48,8 +48,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -PrimitiveGUI_ConeDlg::PrimitiveGUI_ConeDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +PrimitiveGUI_ConeDlg::PrimitiveGUI_ConeDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CONE_PV"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CONE_DXYZ"))); @@ -83,6 +85,8 @@ PrimitiveGUI_ConeDlg::PrimitiveGUI_ConeDlg(GeometryGUI* theGeometryGUI, QWidget* Layout1->addWidget(GroupDimensions, 2, 0); /***************************************************************/ + setHelpFileName( "cone.htm" ); + Init(); } @@ -148,12 +152,12 @@ void PrimitiveGUI_ConeDlg::Init() connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); connect(GroupDimensions->SpinBox_DZ, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DZ, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DZ, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DZ, SLOT(SetStep(double))); connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; diff --git a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h index 17d913e25..6ac583460 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_ConeDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : PrimitiveGUI_ConeDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_CONE_H #define DIALOGBOX_CONE_H @@ -42,7 +41,8 @@ class PrimitiveGUI_ConeDlg : public GEOMBase_Skeleton Q_OBJECT public: - PrimitiveGUI_ConeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + PrimitiveGUI_ConeDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~PrimitiveGUI_ConeDlg(); protected: @@ -60,8 +60,6 @@ private: double getRadius2() const; double getHeight() const; - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint, myDir; DlgRef_2Sel3Spin* GroupPoints; @@ -78,7 +76,6 @@ private slots: void SetEditCurrentArgument(); void ConstructorsClicked(int); void ValueChangedInSpinBox(); - }; #endif // DIALOGBOX_CONE_H diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx index 19aaff74d..7a5f38236 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -48,8 +48,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -PrimitiveGUI_CylinderDlg::PrimitiveGUI_CylinderDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +PrimitiveGUI_CylinderDlg::PrimitiveGUI_CylinderDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CYLINDER_PV"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CYLINDER_DXYZ"))); @@ -81,6 +83,8 @@ PrimitiveGUI_CylinderDlg::PrimitiveGUI_CylinderDlg(GeometryGUI* theGeometryGUI, Layout1->addWidget(GroupDimensions, 2, 0); /***************************************************************/ + setHelpFileName("cylinder.htm"); + Init(); } @@ -143,10 +147,10 @@ void PrimitiveGUI_CylinderDlg::Init() connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; diff --git a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h index 3ed400a0e..d6f8391be 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_CylinderDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : PrimitiveGUI_CylinderDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_CYLINDER_H #define DIALOGBOX_CYLINDER_H @@ -43,7 +42,8 @@ class PrimitiveGUI_CylinderDlg : public GEOMBase_Skeleton Q_OBJECT public: - PrimitiveGUI_CylinderDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + PrimitiveGUI_CylinderDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~PrimitiveGUI_CylinderDlg(); protected: @@ -60,8 +60,6 @@ private: double getRadius() const; double getHeight() const; - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint, myDir; DlgRef_2Sel2Spin* GroupPoints; diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx index 49bca1dc2..3c4e8adeb 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -48,8 +48,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -PrimitiveGUI_SphereDlg::PrimitiveGUI_SphereDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +PrimitiveGUI_SphereDlg::PrimitiveGUI_SphereDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SPHERE_P"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SPHERE_DXYZ"))); @@ -77,6 +79,8 @@ PrimitiveGUI_SphereDlg::PrimitiveGUI_SphereDlg(GeometryGUI* theGeometryGUI, QWid Layout1->addWidget(GroupDimensions, 2, 0); /***************************************************************/ + setHelpFileName("sphere.htm"); + Init(); } @@ -124,9 +128,9 @@ void PrimitiveGUI_SphereDlg::Init() connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); - + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); + connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); diff --git a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h index 10042e22f..7885126b2 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_SphereDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : PrimitiveGUI_SphereDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_SPHERE_H #define DIALOGBOX_SPHERE_H @@ -43,7 +42,8 @@ class PrimitiveGUI_SphereDlg : public GEOMBase_Skeleton Q_OBJECT public: - PrimitiveGUI_SphereDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + PrimitiveGUI_SphereDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~PrimitiveGUI_SphereDlg(); protected: @@ -54,13 +54,11 @@ protected: virtual void closeEvent( QCloseEvent* e ); -private : +private: void Init(); void enterEvent(QEvent* e); double getRadius() const; - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint; /* Center point */ DlgRef_1Sel1Spin* GroupPoints; diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx index 05e6c7b6c..fe98d7cc7 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx +++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -48,13 +48,15 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -PrimitiveGUI_TorusDlg::PrimitiveGUI_TorusDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +PrimitiveGUI_TorusDlg::PrimitiveGUI_TorusDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_TORUS_PV"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_TORUS_DXYZ"))); QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); - + setCaption(tr("GEOM_TORUS_TITLE")); /***************************************************************/ @@ -80,6 +82,8 @@ PrimitiveGUI_TorusDlg::PrimitiveGUI_TorusDlg(GeometryGUI* theGeometryGUI, QWidge Layout1->addWidget(GroupPoints, 2, 0); Layout1->addWidget(GroupDimensions, 2, 0); /***************************************************************/ + + setHelpFileName("turus.htm"); Init(); } @@ -139,10 +143,10 @@ void PrimitiveGUI_TorusDlg::Init() connect(GroupDimensions->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); connect(GroupDimensions->SpinBox_DY, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY, SLOT(SetStep(double))); connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; @@ -152,7 +156,6 @@ void PrimitiveGUI_TorusDlg::Init() } - //================================================================================= // function : ConstructorsClicked() // purpose : Radio button management diff --git a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h index ef90ffbdf..00d6a46b6 100644 --- a/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h +++ b/src/PrimitiveGUI/PrimitiveGUI_TorusDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : PrimitiveGUI_TorusDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_TORUS_H #define DIALOGBOX_TORUS_H @@ -43,7 +42,8 @@ class PrimitiveGUI_TorusDlg : public GEOMBase_Skeleton Q_OBJECT public: - PrimitiveGUI_TorusDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + PrimitiveGUI_TorusDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~PrimitiveGUI_TorusDlg(); protected: @@ -53,20 +53,18 @@ protected: virtual bool execute( ObjectList& objects ); virtual void closeEvent( QCloseEvent* e ); - + private: void Init(); void enterEvent(QEvent* e); double getRadius1() const; double getRadius2() const; - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myPoint, myDir; - + DlgRef_2Sel2Spin* GroupPoints; DlgRef_2Spin* GroupDimensions; - + private slots: void ClickOnOk(); bool ClickOnApply(); @@ -78,7 +76,6 @@ private: void SetEditCurrentArgument(); void ConstructorsClicked(int); void ValueChangedInSpinBox(); - }; #endif // DIALOGBOX_TORUS_H diff --git a/src/RepairGUI/Makefile.in b/src/RepairGUI/Makefile.in index cc5c61a4c..3c698b919 100644 --- a/src/RepairGUI/Makefile.in +++ b/src/RepairGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -70,8 +70,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMBase diff --git a/src/RepairGUI/RepairGUI.cxx b/src/RepairGUI/RepairGUI.cxx index fa4187134..8e5f50a1e 100644 --- a/src/RepairGUI/RepairGUI.cxx +++ b/src/RepairGUI/RepairGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -86,39 +86,19 @@ RepairGUI::~RepairGUI() bool RepairGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) { getGeometryGUI()->EmitSignalDeactivateDialog(); - + QDialog* aDlg = NULL; switch (theCommandID) { - case 601: // SEWING - aDlg = new RepairGUI_SewingDlg( parent, "" ); - break; - case 602: // GLUE FACES - aDlg = new RepairGUI_GlueDlg( parent, "" ); - break; - case 603: // SUPPRESS FACES - aDlg = new RepairGUI_SuppressFacesDlg( parent, "" ); - break; - case 604: // SUPPRESS HOLES - aDlg = new RepairGUI_RemoveHolesDlg( parent, "" ); - break; - case 605: // SHAPE PROCESSING - aDlg = new RepairGUI_ShapeProcessDlg( parent, "" ); - break; - case 606: // CLOSE CONTOUR - aDlg = new RepairGUI_CloseContourDlg( parent, "" ); - break; - case 607: // REMOVE INTERNAL WIRES - aDlg = new RepairGUI_RemoveIntWiresDlg( parent, "" ); - break; - case 608: // ADD POINT ON EDGE - aDlg = new RepairGUI_DivideEdgeDlg( getGeometryGUI(), parent, "" ); - break; - case 609: // FREE BOUNDARIES - aDlg = new RepairGUI_FreeBoundDlg( getGeometryGUI(), parent ); - break; - case 610: // FREE FACES - aDlg = new RepairGUI_FreeFacesDlg( getGeometryGUI(), parent, "" ); - break; + case 601: aDlg = new RepairGUI_SewingDlg (getGeometryGUI(), parent, ""); break; + case 602: aDlg = new RepairGUI_GlueDlg (getGeometryGUI(), parent, ""); break; + case 603: aDlg = new RepairGUI_SuppressFacesDlg (getGeometryGUI(), parent, ""); break; + case 604: aDlg = new RepairGUI_RemoveHolesDlg (getGeometryGUI(), parent, ""); break; + case 605: aDlg = new RepairGUI_ShapeProcessDlg (getGeometryGUI(), parent, ""); break; + case 606: aDlg = new RepairGUI_CloseContourDlg (getGeometryGUI(), parent, ""); break; + case 607: aDlg = new RepairGUI_RemoveIntWiresDlg(getGeometryGUI(), parent, ""); break; + case 608: aDlg = new RepairGUI_DivideEdgeDlg (getGeometryGUI(), parent, ""); break; + case 609: aDlg = new RepairGUI_FreeBoundDlg (getGeometryGUI(), parent, ""); break; + case 610: aDlg = new RepairGUI_FreeFacesDlg (getGeometryGUI(), parent, ""); break; default: SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); break; @@ -126,7 +106,7 @@ bool RepairGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) if ( aDlg ) aDlg->show(); - + return true; } diff --git a/src/RepairGUI/RepairGUI.h b/src/RepairGUI/RepairGUI.h index 000fa1137..bbeadad2c 100644 --- a/src/RepairGUI/RepairGUI.h +++ b/src/RepairGUI/RepairGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx index e5bb3a708..640306b4b 100644 --- a/src/RepairGUI/RepairGUI_CloseContourDlg.cxx +++ b/src/RepairGUI/RepairGUI_CloseContourDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -50,8 +50,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -RepairGUI_CloseContourDlg::RepairGUI_CloseContourDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +RepairGUI_CloseContourDlg::RepairGUI_CloseContourDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_CLOSECONTOUR"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -101,6 +103,8 @@ RepairGUI_CloseContourDlg::RepairGUI_CloseContourDlg(QWidget* parent, const char GroupPoints->getGroupBoxLayout()->addMultiCellWidget(myIsVertexGr, 2, 2, 0, 2); /***************************************************************/ + setHelpFileName("close_contour.htm"); + Init(); } @@ -131,10 +135,6 @@ void RepairGUI_CloseContourDlg::Init() initSelection(); /* signals and slots connections */ - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -143,7 +143,7 @@ void RepairGUI_CloseContourDlg::Init() connect(mySelectWiresBtn, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); connect(mySelectWiresEdt, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); initName( tr( "CLOSE_CONTOUR_NEW_OBJ_NAME" ) ); @@ -183,16 +183,6 @@ bool RepairGUI_CloseContourDlg::ClickOnApply() return true; } - -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void RepairGUI_CloseContourDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed or other case @@ -221,7 +211,7 @@ void RepairGUI_CloseContourDlg::SelectionIntoArgument() { myEditCurrentArgument->setText( GEOMBase::GetName( myObject ) ); TopoDS_Shape aShape; - if ( myGeomBase->GetShape( myObject, aShape, TopAbs_WIRE ) ) + if ( GEOMBase::GetShape( myObject, aShape, TopAbs_WIRE ) ) mySelectWiresEdt->setText( myEditCurrentArgument->text() ); } else @@ -230,7 +220,7 @@ void RepairGUI_CloseContourDlg::SelectionIntoArgument() else if ( myEditCurrentArgument == mySelectWiresEdt ) { TColStd_IndexedMapOfInteger aMap; - ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( anIO, aMap ); + myGeomGUI->getApp()->selectionMgr()->GetIndexes( anIO, aMap ); const int n = aMap.Extent(); myWiresInd->length( n ); for ( int i = 1; i <= n; i++ ) @@ -276,17 +266,6 @@ void RepairGUI_CloseContourDlg::LineEditReturnPressed() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void RepairGUI_CloseContourDlg::DeactivateActiveDialog() -{ - //myGeomGUI->SetState( -1 ); - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ActivateThisDialog() // purpose : @@ -294,7 +273,7 @@ void RepairGUI_CloseContourDlg::DeactivateActiveDialog() void RepairGUI_CloseContourDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); myEditCurrentArgument = GroupPoints->LineEdit1; @@ -345,7 +324,7 @@ GEOM::GEOM_IOperations_ptr RepairGUI_CloseContourDlg::createOperation() bool RepairGUI_CloseContourDlg::isValid( QString& msg ) { TopoDS_Shape aTmpShape; - return !myObject->_is_nil() && ( myWiresInd->length() || myGeomBase->GetShape( myObject, aTmpShape, TopAbs_WIRE ) ); + return !myObject->_is_nil() && ( myWiresInd->length() || GEOMBase::GetShape( myObject, aTmpShape, TopAbs_WIRE ) ); } //================================================================================= @@ -394,5 +373,3 @@ void RepairGUI_CloseContourDlg::initSelection() localSelection( myObject, TopAbs_WIRE ); } } - - diff --git a/src/RepairGUI/RepairGUI_CloseContourDlg.h b/src/RepairGUI/RepairGUI_CloseContourDlg.h index 08c183664..81e4233d2 100644 --- a/src/RepairGUI/RepairGUI_CloseContourDlg.h +++ b/src/RepairGUI/RepairGUI_CloseContourDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_CloseContourDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_CloseContour_H #define DIALOGBOX_CloseContour_H @@ -46,7 +45,8 @@ class RepairGUI_CloseContourDlg : public GEOMBase_Skeleton Q_OBJECT public: - RepairGUI_CloseContourDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + RepairGUI_CloseContourDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~RepairGUI_CloseContourDlg(); protected: @@ -55,7 +55,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& objects ); -private : +private: void Init(); void enterEvent(QEvent* e); void closeEvent(QCloseEvent* e); @@ -75,10 +75,8 @@ private : private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx index 969b7162a..648ae2fe9 100644 --- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx +++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -50,11 +50,9 @@ using namespace std; //================================================================================= RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg (GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - : GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | + : GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - myGeomGUI = theGeometryGUI; - QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_DIVIDE_EDGE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -92,10 +90,11 @@ RepairGUI_DivideEdgeDlg::RepairGUI_DivideEdgeDlg (GeometryGUI* theGeometryGUI, Q GroupPoints->getGroupBoxLayout()->addLayout( aLay, 2, 0 ); /***************************************************************/ + setHelpFileName("add_point_on_edge.htm"); + Init(); } - //================================================================================= // function : ~RepairGUI_DivideEdgeDlg() // purpose : Destroys the object and frees any allocated resources @@ -104,7 +103,6 @@ RepairGUI_DivideEdgeDlg::~RepairGUI_DivideEdgeDlg() { } - //================================================================================= // function : Init() // purpose : @@ -121,10 +119,6 @@ void RepairGUI_DivideEdgeDlg::Init() initSelection(); /* signals and slots connections */ - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -170,16 +164,6 @@ bool RepairGUI_DivideEdgeDlg::ClickOnApply() } -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void RepairGUI_DivideEdgeDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed or other case @@ -200,7 +184,7 @@ void RepairGUI_DivideEdgeDlg::SelectionIntoArgument() if ( !CORBA::is_nil( aSelectedObj ) && aRes ) { TopoDS_Shape aShape; - if ( myGeomBase->GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) ) + if ( GEOMBase::GetShape( aSelectedObj, aShape, TopAbs_SHAPE ) ) { const int aType = aShape.ShapeType(); if ( aType <= TopAbs_EDGE ) // edge, wire, face, shell, solid, compound @@ -264,16 +248,6 @@ void RepairGUI_DivideEdgeDlg::LineEditReturnPressed() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void RepairGUI_DivideEdgeDlg::DeactivateActiveDialog() -{ - //myGeomGUI->SetState( -1 ); - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - //================================================================================= // function : ActivateThisDialog() // purpose : diff --git a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h index 02cf3a262..d2099375b 100644 --- a/src/RepairGUI/RepairGUI_DivideEdgeDlg.h +++ b/src/RepairGUI/RepairGUI_DivideEdgeDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_DivideEdgeDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_DivideEdge_H #define DIALOGBOX_DivideEdge_H @@ -57,7 +56,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& objects ); -private : +private: void Init(); void enterEvent(QEvent* e); void closeEvent(QCloseEvent* e); @@ -75,10 +74,8 @@ private : protected slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx index 896c0f0d4..f27424686 100644 --- a/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx +++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -33,7 +33,9 @@ #include "GEOMImpl_Types.hxx" #include "SalomeApp_Application.h" +#include "LightApp_Application.h" #include "LightApp_SelectionMgr.h" +#include "SUIT_MessageBox.h" #include "SUIT_Session.h" #include @@ -47,21 +49,20 @@ #define SPACING 5 #define MARGIN 10 -/* - Calss : RepairGUI_FreeBoundDlg +/*! + Class : RepairGUI_FreeBoundDlg Description : Dialog for displaying free boundaries of selected face, shell or solid */ - //================================================================================= // function : RepairGUI_FreeBoundDlg // purpose : Constructor //================================================================================= -RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg( GeometryGUI* theGUI, QWidget* theParent ) +RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg(GeometryGUI* theGUI, QWidget* theParent, const char*) : QDialog( theParent, "RepairGUI_FreeBoundDlg", false, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ), GEOMBase_Helper( dynamic_cast( theParent ) ), - myGeomGUI ( theGUI ) + myGeomGUI( theGUI ) { setCaption( tr( "CAPTION" ) ); @@ -84,10 +85,11 @@ RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg( GeometryGUI* theGUI, QWidget* th QFrame* aFrame = new QFrame( this ); aFrame->setFrameStyle( QFrame::Box | QFrame::Sunken ); QPushButton* aCloseBtn = new QPushButton( tr( "GEOM_BUT_CLOSE" ), aFrame ); + QPushButton* aHelpBtn = new QPushButton( tr( "GEOM_BUT_HELP" ), aFrame ); QHBoxLayout* aBtnLay = new QHBoxLayout( aFrame, MARGIN, SPACING ); - aBtnLay->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); aBtnLay->addWidget( aCloseBtn ); aBtnLay->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); + aBtnLay->addWidget( aHelpBtn ); QVBoxLayout* aLay = new QVBoxLayout( this ); aLay->setSpacing( SPACING ); @@ -95,7 +97,10 @@ RepairGUI_FreeBoundDlg::RepairGUI_FreeBoundDlg( GeometryGUI* theGUI, QWidget* th aLay->addWidget( aMainGrp ); aLay->addWidget( aFrame ); + myHelpFileName = "check_free_boundaries.htm"; + connect( aCloseBtn, SIGNAL( clicked() ), SLOT( onClose() ) ); + connect( aHelpBtn, SIGNAL( clicked() ), SLOT( onHelp() ) ); Init(); } @@ -121,6 +126,23 @@ void RepairGUI_FreeBoundDlg::onClose() erasePreview(); } +//================================================================================= +// function : onHelp() +// purpose : +//================================================================================= +void RepairGUI_FreeBoundDlg::onHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) + app->onHelpContextModule(myGeomGUI ? app->moduleName(myGeomGUI->moduleName()) : QString(""), myHelpFileName); + else { + SUIT_MessageBox::warn1 + (0, tr("WRN_WARNING"), tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(myHelpFileName), + tr("BUT_OK")); + } +} + //================================================================================= // function : onDeactivate // purpose : Deactivate this dialog @@ -129,7 +151,7 @@ void RepairGUI_FreeBoundDlg::onDeactivate() { setEnabled(false); globalSelection(); - disconnect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0 ); + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myGeomGUI->SetActiveDialogBox( 0 ); } @@ -168,7 +190,6 @@ void RepairGUI_FreeBoundDlg::onSelectionDone() myObj = anObj; displayPreview( false, true, true, 3 ); } - } //================================================================================= @@ -277,6 +298,3 @@ bool RepairGUI_FreeBoundDlg::execute( ObjectList& objects ) return result; } - - - diff --git a/src/RepairGUI/RepairGUI_FreeBoundDlg.h b/src/RepairGUI/RepairGUI_FreeBoundDlg.h index e317cc3a7..4189527f2 100644 --- a/src/RepairGUI/RepairGUI_FreeBoundDlg.h +++ b/src/RepairGUI/RepairGUI_FreeBoundDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_FreeBoundDlg.h // Author : Sergey LITONIN // Module : GEOM -// $Header$ #ifndef DIALOGBOX_WHATIS_H #define DIALOGBOX_WHATIS_H @@ -47,18 +46,17 @@ class RepairGUI_FreeBoundDlg : public QDialog, Q_OBJECT public: - RepairGUI_FreeBoundDlg( GeometryGUI*, QWidget* ); - ~RepairGUI_FreeBoundDlg(); + RepairGUI_FreeBoundDlg(GeometryGUI*, QWidget*, const char* name = 0); + ~RepairGUI_FreeBoundDlg(); private slots: - void onClose(); + void onHelp(); void onDeactivate(); void onActivate(); void onSelectionDone(); private: - void Init(); void enterEvent( QEvent* e ); void closeEvent( QCloseEvent* e ); @@ -69,7 +67,6 @@ private: virtual bool isValid( QString& ); private: - QLineEdit* myEdit; QLabel* myClosedLbl; QLabel* myOpenLbl; @@ -77,16 +74,7 @@ private: GeometryGUI* myGeomGUI; int myNbClosed; int myNbOpen; + QString myHelpFileName; }; #endif // DIALOGBOX_WHATIS_H - - - - - - - - - - diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx index 3143b7fec..fbfce1638 100644 --- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx +++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -28,10 +28,12 @@ #include "RepairGUI_FreeFacesDlg.h" -#include "SalomeApp_Application.h" +#include "LightApp_Application.h" #include "LightApp_SelectionMgr.h" +#include "SalomeApp_Application.h" #include "SalomeApp_Tools.h" +#include "SUIT_MessageBox.h" #include "SUIT_Session.h" #include "SUIT_OverrideCursor.h" @@ -64,11 +66,12 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg(GeometryGUI* GUI, QWidget* parent, const char* name, bool modal, WFlags fl) -:QDialog( parent, "RepairGUI_FreeBoundDlg", false, - WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose ), - GEOMBase_Helper( dynamic_cast( parent ) ), - myGeomGUI( GUI ) +RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg(GeometryGUI* GUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :QDialog(parent, "RepairGUI_FreeBoundDlg", false, + WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu | WDestructiveClose), + GEOMBase_Helper(dynamic_cast(parent)), + myGeomGUI(GUI) { myDisplayer = 0; @@ -97,10 +100,11 @@ RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg(GeometryGUI* GUI, QWidget* parent QFrame* aFrame = new QFrame( this ); aFrame->setFrameStyle( QFrame::Box | QFrame::Sunken ); QPushButton* aCloseBtn = new QPushButton( tr( "GEOM_BUT_CLOSE" ), aFrame ); + QPushButton* aHelpBtn = new QPushButton( tr( "GEOM_BUT_HELP" ), aFrame ); QHBoxLayout* aBtnLay = new QHBoxLayout( aFrame, MARGIN, SPACING ); - aBtnLay->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); aBtnLay->addWidget( aCloseBtn ); aBtnLay->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); + aBtnLay->addWidget( aHelpBtn ); QVBoxLayout* aLay = new QVBoxLayout( this ); aLay->setSpacing( SPACING ); @@ -109,7 +113,10 @@ RepairGUI_FreeFacesDlg::RepairGUI_FreeFacesDlg(GeometryGUI* GUI, QWidget* parent aLay->addItem( new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum ) ); aLay->addWidget( aFrame ); + myHelpFileName = "check_free_faces.htm"; + connect( aCloseBtn, SIGNAL( clicked() ), SLOT( onClose() ) ); + connect( aHelpBtn, SIGNAL( clicked() ), SLOT( onHelp() ) ); connect( mySelBtn, SIGNAL( clicked() ), this, SLOT ( onSetEditCurrentArgument() ) ); /***************************************************************/ @@ -140,6 +147,23 @@ void RepairGUI_FreeFacesDlg::onClose() erasePreview(); } +//================================================================================= +// function : onHelp() +// purpose : +//================================================================================= +void RepairGUI_FreeFacesDlg::onHelp() +{ + LightApp_Application* app = (LightApp_Application*)(SUIT_Session::session()->activeApplication()); + if (app) + app->onHelpContextModule(myGeomGUI ? app->moduleName(myGeomGUI->moduleName()) : QString(""), myHelpFileName); + else { + SUIT_MessageBox::warn1(0, QObject::tr("WRN_WARNING"), + QObject::tr("EXTERNAL_BROWSER_CANNOT_SHOW_PAGE"). + arg(app->resourceMgr()->stringValue("ExternalBrowser", "application")).arg(myHelpFileName), + QObject::tr("BUT_OK")); + } +} + //================================================================================= // function : onDeactivate // purpose : Deactivate this dialog diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.h b/src/RepairGUI/RepairGUI_FreeFacesDlg.h index f42589b24..cafb9b1d6 100644 --- a/src/RepairGUI/RepairGUI_FreeFacesDlg.h +++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_FreeFacesDlg.h // Author : VKN // Module : GEOM -// $Header$ #ifndef DIALOGBOX_FreeFaces_H #define DIALOGBOX_FreeFaces_H @@ -47,7 +46,8 @@ class RepairGUI_FreeFacesDlg : public QDialog, Q_OBJECT public: - RepairGUI_FreeFacesDlg(GeometryGUI* GUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + RepairGUI_FreeFacesDlg(GeometryGUI* GUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~RepairGUI_FreeFacesDlg(); protected: @@ -56,30 +56,28 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& objects ); -private : - +private: void Init(); void enterEvent(QEvent* e); void closeEvent(QCloseEvent* e); void activateSelection(); - GEOM_Displayer* getDisplayer(); + GEOM_Displayer* getDisplayer(); private slots: + void onClose(); + void onHelp(); + void onDeactivate(); + void onActivate(); + void onSelectionDone(); + void onSetEditCurrentArgument(); - void onClose(); - void onDeactivate(); - void onActivate(); - void onSelectionDone(); - void onSetEditCurrentArgument(); - -private : - +private: GEOM_Displayer* myDisplayer; GEOM::GEOM_Object_var myObj; QPushButton* mySelBtn; QLineEdit* myEdit; GeometryGUI* myGeomGUI; - + QString myHelpFileName; }; #endif // DIALOGBOX_FreeFaces_H diff --git a/src/RepairGUI/RepairGUI_GlueDlg.cxx b/src/RepairGUI/RepairGUI_GlueDlg.cxx index 789a0a704..bcdb30715 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.cxx +++ b/src/RepairGUI/RepairGUI_GlueDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -58,11 +58,13 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -RepairGUI_GlueDlg::RepairGUI_GlueDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +RepairGUI_GlueDlg::RepairGUI_GlueDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_GLUE_FACES"))); - QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); + QPixmap image0 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_GLUE_FACES"))); + QPixmap image1 (SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); setCaption(tr("GEOM_GLUE_TITLE")); @@ -82,7 +84,7 @@ RepairGUI_GlueDlg::RepairGUI_GlueDlg(QWidget* parent, const char* name, bool mod QGridLayout* aLay = new QGridLayout( 0, 2, 2, 0, 6, "aLay" ); QLabel* aLbl1 = new QLabel( tr( "GEOM_TOLERANCE" ), GroupPoints->GroupBox1 ); - myTolEdt = new QtxDblSpinBox( 0, 100, 1e-7, GroupPoints->GroupBox1 );//QAD_SpinBoxDbl( GroupPoints->GroupBox1, 0, 100, 1e-7, 10, 1e-10 ); + myTolEdt = new QtxDblSpinBox( 0, 100, 1e-7, GroupPoints->GroupBox1 ); myTolEdt->setPrecision( 10 ); myTolEdt->setValue( DEFAULT_TOLERANCE_VALUE ); @@ -92,6 +94,8 @@ RepairGUI_GlueDlg::RepairGUI_GlueDlg(QWidget* parent, const char* name, bool mod GroupPoints->getGroupBoxLayout()->addLayout( aLay, 3, 0 ); /***************************************************************/ + setHelpFileName("glue_faces.htm"); + Init(); } @@ -120,10 +124,6 @@ void RepairGUI_GlueDlg::Init() globalSelection( GEOM_COMPOUND ); /* signals and slots connections */ - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -148,7 +148,6 @@ void RepairGUI_GlueDlg::ClickOnOk() } - //================================================================================= // function : ClickOnApply() // purpose : @@ -169,16 +168,6 @@ bool RepairGUI_GlueDlg::ClickOnApply() } -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void RepairGUI_GlueDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection @@ -226,17 +215,6 @@ void RepairGUI_GlueDlg::LineEditReturnPressed() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void RepairGUI_GlueDlg::DeactivateActiveDialog() -{ - //myGeomGUI->SetState( -1 ); - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ActivateThisDialog() // purpose : diff --git a/src/RepairGUI/RepairGUI_GlueDlg.h b/src/RepairGUI/RepairGUI_GlueDlg.h index 2c493dfa5..e23ff3ff2 100644 --- a/src/RepairGUI/RepairGUI_GlueDlg.h +++ b/src/RepairGUI/RepairGUI_GlueDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_GlueDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_Glue_H #define DIALOGBOX_Glue_H @@ -43,7 +42,8 @@ class RepairGUI_GlueDlg : public GEOMBase_Skeleton Q_OBJECT public: - RepairGUI_GlueDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + RepairGUI_GlueDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~RepairGUI_GlueDlg(); protected: @@ -52,7 +52,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& objects ); -private : +private: void Init(); void enterEvent(QEvent* e); void closeEvent(QCloseEvent* e); @@ -70,10 +70,8 @@ private : private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx index 6dc3188eb..4f5b2c335 100644 --- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx +++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -49,8 +49,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -RepairGUI_RemoveHolesDlg::RepairGUI_RemoveHolesDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +RepairGUI_RemoveHolesDlg::RepairGUI_RemoveHolesDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUPPRESS_HOLES"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -103,6 +105,8 @@ RepairGUI_RemoveHolesDlg::RepairGUI_RemoveHolesDlg(QWidget* parent, const char* GroupPoints->getGroupBoxLayout()->addLayout( aDetectLay, 3, 0 ); /***************************************************************/ + setHelpFileName("suppress_holes.htm"); + Init(); } @@ -136,10 +140,6 @@ void RepairGUI_RemoveHolesDlg::Init() myOpen = -1; /* signals and slots connections */ - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -168,8 +168,6 @@ void RepairGUI_RemoveHolesDlg::ClickOnOk() ClickOnCancel(); } - - //================================================================================= // function : ClickOnApply() // purpose : @@ -193,16 +191,6 @@ bool RepairGUI_RemoveHolesDlg::ClickOnApply() } -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void RepairGUI_RemoveHolesDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection @@ -276,17 +264,6 @@ void RepairGUI_RemoveHolesDlg::LineEditReturnPressed() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void RepairGUI_RemoveHolesDlg::DeactivateActiveDialog() -{ - //myGeomGUI->SetState( -1 ); - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ActivateThisDialog() // purpose : diff --git a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h index 42edf5b6e..88a853d41 100644 --- a/src/RepairGUI/RepairGUI_RemoveHolesDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveHolesDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_RemoveHolesDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_RemoveHoles_H #define DIALOGBOX_RemoveHoles_H @@ -48,7 +47,8 @@ class RepairGUI_RemoveHolesDlg : public GEOMBase_Skeleton Q_OBJECT public: - RepairGUI_RemoveHolesDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + RepairGUI_RemoveHolesDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~RepairGUI_RemoveHolesDlg(); protected: @@ -57,7 +57,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& objects ); -private : +private: void Init(); void enterEvent(QEvent* e); void closeEvent(QCloseEvent* e); @@ -73,16 +73,14 @@ private : QLineEdit* mySelectWiresEdt; QPushButton* myFreeBoundBtn; - int myClosed; // number of free closed boundaries detected. calculated in execute(), used in onDetect(). - int myOpen; // number of free open boundaries detected. calculated in execute(), used in onDetect(). + int myClosed; // Number of free closed boundaries detected. Calculated in execute(), used in onDetect(). + int myOpen; // Number of free open boundaries detected. Calculated in execute(), used in onDetect(). private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx index 91822ded9..d86f4bb13 100644 --- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx +++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -47,11 +47,13 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -RepairGUI_RemoveIntWiresDlg::RepairGUI_RemoveIntWiresDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +RepairGUI_RemoveIntWiresDlg::RepairGUI_RemoveIntWiresDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUPPRESS_INT_WIRES"))); - QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); + QPixmap image0 (myGeomGUI->getApp()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUPPRESS_INT_WIRES"))); + QPixmap image1 (myGeomGUI->getApp()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); setCaption(tr("GEOM_REMOVE_INTERNAL_WIRES_TITLE")); @@ -94,6 +96,8 @@ RepairGUI_RemoveIntWiresDlg::RepairGUI_RemoveIntWiresDlg(QWidget* parent, const GroupPoints->getGroupBoxLayout()->addLayout( aSelectWiresLay, 2, 0 ); /***************************************************************/ + setHelpFileName("suppress_internal_wires.htm"); + Init(); } @@ -124,10 +128,6 @@ void RepairGUI_RemoveIntWiresDlg::Init() initSelection(); /* signals and slots connections */ - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -155,8 +155,6 @@ void RepairGUI_RemoveIntWiresDlg::ClickOnOk() ClickOnCancel(); } - - //================================================================================= // function : ClickOnApply() // purpose : @@ -180,16 +178,6 @@ bool RepairGUI_RemoveIntWiresDlg::ClickOnApply() } -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void RepairGUI_RemoveIntWiresDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection @@ -263,17 +251,6 @@ void RepairGUI_RemoveIntWiresDlg::LineEditReturnPressed() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void RepairGUI_RemoveIntWiresDlg::DeactivateActiveDialog() -{ - //myGeomGUI->SetState( -1 ); - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ActivateThisDialog() // purpose : @@ -294,7 +271,6 @@ void RepairGUI_RemoveIntWiresDlg::ActivateThisDialog() initSelection(); } - //================================================================================= // function : enterEvent() // purpose : Mouse enter onto the dialog to activate it @@ -305,7 +281,6 @@ void RepairGUI_RemoveIntWiresDlg::enterEvent(QEvent* e) ActivateThisDialog(); } - //================================================================================= // function : closeEvent() // purpose : @@ -340,12 +315,13 @@ bool RepairGUI_RemoveIntWiresDlg::isValid( QString& msg ) //================================================================================= bool RepairGUI_RemoveIntWiresDlg::execute( ObjectList& objects ) { - GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )->RemoveIntWires( myObject, myWiresInd ); - bool aResult = !anObj->_is_nil(); - if ( aResult ) - objects.push_back( anObj._retn() ); + GEOM::GEOM_Object_var anObj = GEOM::GEOM_IHealingOperations::_narrow( getOperation() )-> + RemoveIntWires( myObject, myWiresInd ); + bool aResult = !anObj->_is_nil(); + if ( aResult ) + objects.push_back( anObj._retn() ); - return aResult; + return aResult; } //================================================================================= @@ -354,7 +330,7 @@ bool RepairGUI_RemoveIntWiresDlg::execute( ObjectList& objects ) //================================================================================= void RepairGUI_RemoveIntWiresDlg::onRemoveAllClicked() { - bool b = myAllChk->isOn(); + bool b = myAllChk->isOn(); mySelectWiresLbl->setEnabled( !b ); mySelectWiresBtn->setEnabled( !b ); mySelectWiresEdt->setEnabled( !b ); @@ -387,5 +363,3 @@ void RepairGUI_RemoveIntWiresDlg::initSelection() localSelection( myObject, TopAbs_WIRE ); } } - - diff --git a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h index 2142784a3..17cf0f364 100644 --- a/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h +++ b/src/RepairGUI/RepairGUI_RemoveIntWiresDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_RemoveIntWiresDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_RemoveIntWires_H #define DIALOGBOX_RemoveIntWires_H @@ -48,7 +47,8 @@ class RepairGUI_RemoveIntWiresDlg : public GEOMBase_Skeleton Q_OBJECT public: - RepairGUI_RemoveIntWiresDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + RepairGUI_RemoveIntWiresDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~RepairGUI_RemoveIntWiresDlg(); protected: @@ -57,14 +57,14 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& objects ); -private : +private: void Init(); void enterEvent(QEvent* e); void closeEvent(QCloseEvent* e); void initSelection(); - GEOM::GEOM_Object_var myObject; - GEOM::short_array_var myWiresInd; + GEOM::GEOM_Object_var myObject; + GEOM::short_array_var myWiresInd; DlgRef_1Sel_Ext* GroupPoints; QCheckBox* myAllChk; @@ -75,10 +75,8 @@ private : private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); diff --git a/src/RepairGUI/RepairGUI_SewingDlg.cxx b/src/RepairGUI/RepairGUI_SewingDlg.cxx index 05ed77509..b09224622 100644 --- a/src/RepairGUI/RepairGUI_SewingDlg.cxx +++ b/src/RepairGUI/RepairGUI_SewingDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -50,8 +50,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -RepairGUI_SewingDlg::RepairGUI_SewingDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +RepairGUI_SewingDlg::RepairGUI_SewingDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SEWING"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -87,6 +89,8 @@ RepairGUI_SewingDlg::RepairGUI_SewingDlg(QWidget* parent, const char* name, bool GroupPoints->getGroupBoxLayout()->addLayout( aLay, 3, 0 ); /***************************************************************/ + setHelpFileName("sewing.htm"); + Init(); } @@ -118,10 +122,6 @@ void RepairGUI_SewingDlg::Init() myOpen = -1; /* signals and slots connections */ - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -147,8 +147,6 @@ void RepairGUI_SewingDlg::ClickOnOk() ClickOnCancel(); } - - //================================================================================= // function : ClickOnApply() // purpose : @@ -169,16 +167,6 @@ bool RepairGUI_SewingDlg::ClickOnApply() } -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void RepairGUI_SewingDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection @@ -229,17 +217,6 @@ void RepairGUI_SewingDlg::LineEditReturnPressed() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void RepairGUI_SewingDlg::DeactivateActiveDialog() -{ - //myGeomGUI->SetState( -1 ); - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ActivateThisDialog() // purpose : diff --git a/src/RepairGUI/RepairGUI_SewingDlg.h b/src/RepairGUI/RepairGUI_SewingDlg.h index c2c459507..54483c317 100644 --- a/src/RepairGUI/RepairGUI_SewingDlg.h +++ b/src/RepairGUI/RepairGUI_SewingDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_SewingDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_Sewing_H #define DIALOGBOX_Sewing_H @@ -49,7 +48,8 @@ class RepairGUI_SewingDlg : public GEOMBase_Skeleton Q_OBJECT public: - RepairGUI_SewingDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + RepairGUI_SewingDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~RepairGUI_SewingDlg(); protected: @@ -58,7 +58,7 @@ protected: virtual bool isValid( QString& ); virtual bool execute( ObjectList& objects ); -private : +private: void Init(); void enterEvent(QEvent* e); void closeEvent(QCloseEvent* e); @@ -70,16 +70,14 @@ private : QtxDblSpinBox* myTolEdt; QPushButton* myFreeBoundBtn; - int myClosed; // number of free closed boundaries detected. calculated in execute(), used in onDetect(). - int myOpen; // number of free open boundaries detected. calculated in execute(), used in onDetect(). + int myClosed; // Number of free closed boundaries detected. Calculated in execute(), used in onDetect(). + int myOpen; // Number of free open boundaries detected. Calculated in execute(), used in onDetect(). private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx index 7c9005a1a..a712e4b5c 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -52,13 +52,15 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -RepairGUI_ShapeProcessDlg::RepairGUI_ShapeProcessDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +RepairGUI_ShapeProcessDlg::RepairGUI_ShapeProcessDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { + setHelpFileName("shape_processing.htm"); init(); } - //================================================================================= // function : ~RepairGUI_ShapeProcessDlg() // purpose : Destroys the object and frees any allocated resources @@ -67,7 +69,6 @@ RepairGUI_ShapeProcessDlg::~RepairGUI_ShapeProcessDlg() { } - //================================================================================= // function : Init() // purpose : @@ -296,10 +297,6 @@ void RepairGUI_ShapeProcessDlg::init() myStack->addWidget( aFrame, myOpLst.findIndex( "SameParameter" ) ); // signals and slots connections - connect( myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(deactivate()) ); - connect( myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(onCancel()) ); - - connect( buttonCancel, SIGNAL(clicked()), this, SLOT(onCancel()) ); connect( buttonOk, SIGNAL(clicked()), this, SLOT(onOk()) ); connect( buttonApply, SIGNAL(clicked()), this, SLOT(onApply()) ); @@ -341,12 +338,10 @@ void RepairGUI_ShapeProcessDlg::operationChanged() //================================================================================= void RepairGUI_ShapeProcessDlg::onOk() { - if ( onApply() ) - onCancel(); + if (onApply()) + ClickOnCancel(); } - - //================================================================================= // function : onApply() // purpose : @@ -365,16 +360,6 @@ bool RepairGUI_ShapeProcessDlg::onApply() } -//================================================================================= -// function : onCancel() -// purpose : -//================================================================================= -void RepairGUI_ShapeProcessDlg::onCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : selectionChanged() // purpose : Called when selection as changed or other case @@ -423,17 +408,6 @@ void RepairGUI_ShapeProcessDlg::lineEditReturnPressed() } -//================================================================================= -// function : deactivate() -// purpose : -//================================================================================= -void RepairGUI_ShapeProcessDlg::deactivate() -{ - //myGeomGUI->SetState( -1 ); - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : activate() // purpose : @@ -842,6 +816,8 @@ void RepairGUI_ShapeProcessDlg::advOptionToggled( bool on ) { QButton* btn = (QButton*)sender(); if ( on && btn->isToggleButton() && - QMessageBox::warning( SUIT_Session::session()->activeApplication()->desktop(), tr( "GEOM_WRN_WARNING" ), tr( "TIME_CONSUMING" ), QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No ) + QMessageBox::warning(myGeomGUI->getApp()->desktop(), + tr( "GEOM_WRN_WARNING" ), tr( "TIME_CONSUMING" ), + QMessageBox::Yes, QMessageBox::No ) == QMessageBox::No ) btn->toggle(); } diff --git a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h index 656ab7afa..3d833fda1 100755 --- a/src/RepairGUI/RepairGUI_ShapeProcessDlg.h +++ b/src/RepairGUI/RepairGUI_ShapeProcessDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_ShapeProcessDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_ShapeProcess_H #define DIALOGBOX_ShapeProcess_H @@ -52,7 +51,8 @@ class RepairGUI_ShapeProcessDlg : public GEOMBase_Skeleton Q_OBJECT public: - RepairGUI_ShapeProcessDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + RepairGUI_ShapeProcessDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~RepairGUI_ShapeProcessDlg(); protected: @@ -63,14 +63,15 @@ protected: virtual void closeEvent( QCloseEvent* e ); -private : +private: void init(); void reset(); void loadDefaults(); // initialize all controls with default values (from resource file) - GEOM::string_array* getActiveOperators(); - GEOM::string_array* getParameters( const GEOM::string_array& theOperators ); - GEOM::string_array* getValues( const GEOM::string_array& theParameters ); - + + GEOM::string_array* getActiveOperators(); + GEOM::string_array* getParameters( const GEOM::string_array& theOperators ); + GEOM::string_array* getValues( const GEOM::string_array& theParameters ); + void enterEvent(QEvent* e); QWidget* getControl( const char* ); @@ -78,7 +79,7 @@ private : // (analize its class and convert the value string) const char* getValue( QWidget* theControl ) const; // retrieve value of the control in the proper way - QStringList myOpLst; // list of available Shape Healing Operators + QStringList myOpLst; // list of available Shape Healing Operators QMap myValMap; // map of parameters of operators //QDict myCtrlMap; // map of controls (values) of parameters void initParamsValues(); // initialize the data structures @@ -90,27 +91,27 @@ private : QListView* myOpList; QWidgetStack* myStack; - QtxDblSpinBox* myFixShapeTol3D; - QtxDblSpinBox* myFixShapeMaxTol3D; - - QtxDblSpinBox* myFixFaceSizeTol; + QtxDblSpinBox* myFixShapeTol3D; + QtxDblSpinBox* myFixShapeMaxTol3D; - QtxDblSpinBox* myDropSmallEdgesTol3D; + QtxDblSpinBox* myFixFaceSizeTol; - QtxDblSpinBox* mySplitAngleAngle; - QtxDblSpinBox* mySplitAngleMaxTol; + QtxDblSpinBox* myDropSmallEdgesTol3D; + + QtxDblSpinBox* mySplitAngleAngle; + QtxDblSpinBox* mySplitAngleMaxTol; QSpinBox* mySplitClosedFacesNum; - QtxDblSpinBox* mySplitContTol3D; + QtxDblSpinBox* mySplitContTol3D; QComboBox* mySplitContSurfCont; QComboBox* mySplitContCurvCont; QCheckBox* myBSplineSurfModeChk; QCheckBox* myBSpline3DCurveChk; QCheckBox* myBSpline2DCurveChk; - QtxDblSpinBox* myBSplineTol3D; - QtxDblSpinBox* myBSplineTol2D; + QtxDblSpinBox* myBSplineTol3D; + QtxDblSpinBox* myBSplineTol2D; QSpinBox* myBSplineDegree; QSpinBox* myBSplineSegments; QComboBox* myBSpline2DCont; @@ -119,17 +120,15 @@ private : QCheckBox* myToBezierSurfModeChk; QCheckBox* myToBezier3DCurveChk; QCheckBox* myToBezier2DCurveChk; - QtxDblSpinBox* myToBezierMaxTol; + QtxDblSpinBox* myToBezierMaxTol; - QtxDblSpinBox* mySameParameterTol3D; + QtxDblSpinBox* mySameParameterTol3D; private slots: void onOk(); bool onApply(); - void onCancel(); - + void activate(); - void deactivate(); void lineEditReturnPressed(); void selectionChanged(); diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx index 4d996d2a1..9ff3ad5f9 100644 --- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx +++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -48,8 +48,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -RepairGUI_SuppressFacesDlg::RepairGUI_SuppressFacesDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +RepairGUI_SuppressFacesDlg::RepairGUI_SuppressFacesDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SUPRESS_FACE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -70,6 +72,8 @@ RepairGUI_SuppressFacesDlg::RepairGUI_SuppressFacesDlg(QWidget* parent, const ch Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + + setHelpFileName("suppress_faces.htm"); Init(); } @@ -100,10 +104,6 @@ void RepairGUI_SuppressFacesDlg::Init() initSelection(); /* signals and slots connections */ - connect(buttonCancel, SIGNAL(clicked()), this, SLOT(ClickOnCancel())); - connect(myGeomGUI, SIGNAL(SignalDeactivateActiveDialog()), this, SLOT(DeactivateActiveDialog())); - connect(myGeomGUI, SIGNAL(SignalCloseAllDialogs()), this, SLOT(ClickOnCancel())); - connect(buttonOk, SIGNAL(clicked()), this, SLOT(ClickOnOk())); connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); @@ -127,8 +127,6 @@ void RepairGUI_SuppressFacesDlg::ClickOnOk() ClickOnCancel(); } - - //================================================================================= // function : ClickOnApply() // purpose : @@ -150,16 +148,6 @@ bool RepairGUI_SuppressFacesDlg::ClickOnApply() } -//================================================================================= -// function : ClickOnCancel() -// purpose : -//================================================================================= -void RepairGUI_SuppressFacesDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed or other case @@ -181,14 +169,14 @@ void RepairGUI_SuppressFacesDlg::SelectionIntoArgument() if ( !CORBA::is_nil( aSelectedObject ) && aRes ) { TopoDS_Shape aShape; - if ( myGeomBase->GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) ) + if ( GEOMBase::GetShape( aSelectedObject, aShape, TopAbs_SHAPE ) ) { if ( aShape.ShapeType() <= TopAbs_FACE ) // FACE, SHELL, SOLID, COMPOUND { GEOM::short_array anIndexes; TColStd_IndexedMapOfInteger aMap; - ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr()->GetIndexes( anIO, aMap ); + myGeomGUI->getApp()->selectionMgr()->GetIndexes( anIO, aMap ); if ( !aMap.IsEmpty() ) { @@ -247,17 +235,6 @@ void RepairGUI_SuppressFacesDlg::LineEditReturnPressed() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : -//================================================================================= -void RepairGUI_SuppressFacesDlg::DeactivateActiveDialog() -{ - //myGeomGUI->SetState( -1 ); - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ActivateThisDialog() // purpose : diff --git a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h index e725f0e64..cdf863913 100644 --- a/src/RepairGUI/RepairGUI_SuppressFacesDlg.h +++ b/src/RepairGUI/RepairGUI_SuppressFacesDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : RepairGUI_SuppressFacesDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_SUPPRESSFACES_H #define DIALOGBOX_SUPPRESSFACES_H @@ -43,7 +42,8 @@ class RepairGUI_SuppressFacesDlg : public GEOMBase_Skeleton Q_OBJECT public: - RepairGUI_SuppressFacesDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + RepairGUI_SuppressFacesDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~RepairGUI_SuppressFacesDlg(); protected: @@ -57,25 +57,23 @@ private : void enterEvent(QEvent* e); void closeEvent(QCloseEvent* e); - GEOM::ListOfGO_var myObjects; - QValueList myFaces; - // GEOM::short_array-s contain indexes of selected faces, - // index of a GEOM::short_array in myFaces list equals to index of - // GEOM::GEOM_Object in myObjects list to which the faces belong to. - - void Convert( const TColStd_IndexedMapOfInteger&, GEOM::short_array& ); + GEOM::ListOfGO_var myObjects; + QValueList myFaces; + // GEOM::short_array-s contain indexes of selected faces, + // index of a GEOM::short_array in myFaces list equals to index of + // GEOM::GEOM_Object in myObjects list to which the faces belong to. + + void Convert( const TColStd_IndexedMapOfInteger&, GEOM::short_array& ); + + void initSelection(); - void initSelection(); - DlgRef_1Sel_QTD* GroupPoints; private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); - + void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); diff --git a/src/SKETCHER/Makefile.in b/src/SKETCHER/Makefile.in index a33057685..70751d243 100644 --- a/src/SKETCHER/Makefile.in +++ b/src/SKETCHER/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -43,9 +43,9 @@ LIB_CLIENT_IDL = SALOME_Component.idl SALOMEDS.idl SALOME_Exception.idl SALOME_G EXPORT_HEADERS= Sketcher_Profile.hxx # additionnal information to compil and link file -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) -L${KERNEL_ROOT_DIR}/lib/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) +LDFLAGS += $(CAS_KERNEL) $(CAS_MODELER) $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/SKETCHER/Sketcher_Profile.cxx b/src/SKETCHER/Sketcher_Profile.cxx index ad436a67d..d5b5a4b7b 100644 --- a/src/SKETCHER/Sketcher_Profile.cxx +++ b/src/SKETCHER/Sketcher_Profile.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/SKETCHER/Sketcher_Profile.hxx b/src/SKETCHER/Sketcher_Profile.hxx index 79762a9d1..c05f79735 100644 --- a/src/SKETCHER/Sketcher_Profile.hxx +++ b/src/SKETCHER/Sketcher_Profile.hxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/STEPExport/Makefile.in b/src/STEPExport/Makefile.in index bd977ab07..067efe76a 100644 --- a/src/STEPExport/Makefile.in +++ b/src/STEPExport/Makefile.in @@ -14,7 +14,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -37,9 +37,9 @@ LIB= libSTEPExport.la LIB_SRC = STEPExport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKSTEP -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKSTEP $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/STEPExport/STEPExport.cxx b/src/STEPExport/STEPExport.cxx index 7317e6d2b..290ab74b2 100644 --- a/src/STEPExport/STEPExport.cxx +++ b/src/STEPExport/STEPExport.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: STEPExport.cxx // Created: Wed May 19 14:53:52 2004 diff --git a/src/STEPImport/Makefile.in b/src/STEPImport/Makefile.in index 4881cc07b..5ecf12150 100644 --- a/src/STEPImport/Makefile.in +++ b/src/STEPImport/Makefile.in @@ -14,7 +14,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -37,9 +37,9 @@ LIB= libSTEPImport.la LIB_SRC = STEPImport.cxx # additionnal information to compil and link file -CPPFLAGS+= $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS+= $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS+= $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS+= $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) -LDFLAGS+= $(CAS_LDPATH) -lTKSTEP -L${KERNEL_ROOT_DIR}/lib/salome +LDFLAGS+= $(CAS_LDPATH) -lTKSTEP $(KERNEL_LDFLAGS) @CONCLUDE@ diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx index 55ff94336..00cd419e4 100644 --- a/src/STEPImport/STEPImport.cxx +++ b/src/STEPImport/STEPImport.cxx @@ -15,7 +15,7 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: STEPImport.cxx // Created: Wed May 19 14:41:10 2004 @@ -64,6 +64,7 @@ extern "C" { STEPIMPORT_EXPORT TopoDS_Shape Import (const TCollection_AsciiString& theFileName, + const TCollection_AsciiString& /*theFormatName*/, TCollection_AsciiString& theError) { MESSAGE("Import STEP model from file " << theFileName.ToCString()); diff --git a/src/ShHealOper/Makefile.in b/src/ShHealOper/Makefile.in index 82f11b3a4..f164e12eb 100644 --- a/src/ShHealOper/Makefile.in +++ b/src/ShHealOper/Makefile.in @@ -17,7 +17,7 @@ # 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.salome-platform.org or email : webmaster.salome@opencascade.org +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -69,8 +69,8 @@ EXPORT_HEADERS = \ # idl files EXPORT_IDLS= -CPPFLAGS += $(OCC_INCLUDES) -I${KERNEL_ROOT_DIR}/include/salome -CXXFLAGS += $(OCC_CXXFLAGS) -I${KERNEL_ROOT_DIR}/include/salome +CPPFLAGS += $(OCC_INCLUDES) $(KERNEL_CXXFLAGS) +CXXFLAGS += $(OCC_CXXFLAGS) $(KERNEL_CXXFLAGS) LDFLAGS += $(CAS_KERNEL) $(CAS_MATH) $(CAS_TKTopAlgo) $(CAS_LDPATH) -lTKBool -lTKShHealing diff --git a/src/ShHealOper/ShHealOper_CloseContour.cxx b/src/ShHealOper/ShHealOper_CloseContour.cxx index e4d171b34..0c9d360c2 100644 --- a/src/ShHealOper/ShHealOper_CloseContour.cxx +++ b/src/ShHealOper/ShHealOper_CloseContour.cxx @@ -15,12 +15,11 @@ // 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.salome-platform.org/ +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // File: ShHealOper_CloseContour.cxx // Created: 20.04.04 11:36:01 // Author: Galina KULIKOVA -// Copyright: Airbus Industries 2004 #include @@ -54,20 +53,20 @@ #include #include #include + //======================================================================= //function : ShHealOper_CloseContour() //purpose : Constructor //======================================================================= - ShHealOper_CloseContour::ShHealOper_CloseContour (const TopoDS_Shape& theShape ) { Init(theShape); } + //======================================================================= //function : Init //purpose : //======================================================================= - void ShHealOper_CloseContour::Init(const TopoDS_Shape& theShape) { ShHealOper_Tool::Init(theShape); @@ -75,11 +74,11 @@ void ShHealOper_CloseContour::Init(const TopoDS_Shape& theShape) myMaxTolerance = 1.0; TopExp::MapShapesAndAncestors(theShape,TopAbs_EDGE,TopAbs_FACE,myMapEdgesFace); } + //======================================================================= //function : Perform //purpose : //======================================================================= - Standard_Boolean ShHealOper_CloseContour::Perform(const TopTools_SequenceOfShape& theSeqEdges, const Standard_Boolean theModeVertex, const Standard_Boolean theModeFixGapsCurves) @@ -103,11 +102,11 @@ Standard_Boolean ShHealOper_CloseContour::Perform(const TopTools_SequenceOfShape return myDone; } + //======================================================================= //function : Perform //purpose : //======================================================================= - Standard_Boolean ShHealOper_CloseContour::Perform(const TopoDS_Wire& theWire, const Standard_Boolean theModeVertex, const Standard_Boolean theModeFixGapsCurves) @@ -124,11 +123,11 @@ Standard_Boolean ShHealOper_CloseContour::Perform(const TopoDS_Wire& theWire, build(asewd); return myDone; } + //======================================================================= //function : Build //purpose : //======================================================================= - void ShHealOper_CloseContour::build(Handle(ShapeExtend_WireData)& theSewd) { TopTools_SequenceOfShape aCommonFaces; @@ -229,11 +228,11 @@ void ShHealOper_CloseContour::build(Handle(ShapeExtend_WireData)& theSewd) } return; } + //======================================================================= //function : checkGaps //purpose : //======================================================================= - Standard_Boolean ShHealOper_CloseContour::fixGaps(const Handle(ShapeExtend_WireData)& theWire, const TopTools_SequenceOfShape& theCommonFaces) { @@ -267,11 +266,9 @@ Standard_Boolean ShHealOper_CloseContour::fixGaps(const Handle(ShapeExtend_WireD //function : checkOneFace //purpose : //======================================================================= - Standard_Boolean ShHealOper_CloseContour::checkOneFace(const Handle(ShapeExtend_WireData)& theSewd, TopTools_SequenceOfShape& theCommonFaces) const { - TopTools_IndexedMapOfShape amapfaces; TopoDS_Edge aEdge1 = theSewd->Edge(1); Standard_Boolean isOneFace = myMapEdgesFace.Contains(aEdge1 ); @@ -329,13 +326,13 @@ Standard_Boolean ShHealOper_CloseContour::checkOneFace(const Handle(ShapeExtend_ theCommonFaces.Append(aF); } } - return isOneFace; + return isOneFace; } + //======================================================================= //function : buildEdge //purpose : //======================================================================= - void ShHealOper_CloseContour::buildEdge(const TopoDS_Edge& aE1, const TopoDS_Edge& aE2, const TopTools_SequenceOfShape& theCommonFaces) @@ -404,11 +401,11 @@ void ShHealOper_CloseContour::buildEdge(const TopoDS_Edge& aE1, myFreeEdges.Append(edge); } } + //======================================================================= //function : UpdateWire //purpose : //======================================================================= - void ShHealOper_CloseContour::updateWire (Handle(ShapeExtend_WireData)& sbwd) { Standard_Integer i=1; diff --git a/src/ShHealOper/ShHealOper_CloseContour.hxx b/src/ShHealOper/ShHealOper_CloseContour.hxx index aab0fa3dd..de664780a 100644 --- a/src/ShHealOper/ShHealOper_CloseContour.hxx +++ b/src/ShHealOper/ShHealOper_CloseContour.hxx @@ -1,24 +1,26 @@ -// File: ShHealOper_CloseContour.hxx -// Created: 20.04.04 10:25:46 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_CloseContour.hxx +// Created: 20.04.04 10:25:46 +// Author: Galina KULIKOVA #ifndef ShHealOper_CloseContour_HeaderFile diff --git a/src/ShHealOper/ShHealOper_EdgeDivide.cxx b/src/ShHealOper/ShHealOper_EdgeDivide.cxx index 183b68d32..0eb1563b2 100644 --- a/src/ShHealOper/ShHealOper_EdgeDivide.cxx +++ b/src/ShHealOper/ShHealOper_EdgeDivide.cxx @@ -1,24 +1,26 @@ -// File: ShHealOper_EdgeDivide.cxx -// Created: 30.04.04 16:44:47 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_EdgeDivide.cxx +// Created: 30.04.04 16:44:47 +// Author: Galina KULIKOVA #include #include diff --git a/src/ShHealOper/ShHealOper_EdgeDivide.hxx b/src/ShHealOper/ShHealOper_EdgeDivide.hxx index 37b40e751..32cad6860 100644 --- a/src/ShHealOper/ShHealOper_EdgeDivide.hxx +++ b/src/ShHealOper/ShHealOper_EdgeDivide.hxx @@ -1,24 +1,26 @@ -// File: ShHealOper_EdgeDivide.hxx -// Created: 30.04.04 16:06:25 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_EdgeDivide.hxx +// Created: 30.04.04 16:06:25 +// Author: Galina KULIKOVA #ifndef ShHealOper_EdgeDivide_HeaderFile diff --git a/src/ShHealOper/ShHealOper_FillHoles.cxx b/src/ShHealOper/ShHealOper_FillHoles.cxx index d80857e74..2edfa6c68 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.cxx +++ b/src/ShHealOper/ShHealOper_FillHoles.cxx @@ -1,24 +1,26 @@ -// File: ShHealOper_FillHoles.cxx -// Created: 26.04.04 17:35:30 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_FillHoles.cxx +// Created: 26.04.04 17:35:30 +// Author: Galina KULIKOVA #include diff --git a/src/ShHealOper/ShHealOper_FillHoles.hxx b/src/ShHealOper/ShHealOper_FillHoles.hxx index 9d43402ab..2ad1ff6e5 100644 --- a/src/ShHealOper/ShHealOper_FillHoles.hxx +++ b/src/ShHealOper/ShHealOper_FillHoles.hxx @@ -1,25 +1,26 @@ -// File: ShHealOper_FillHoles.hxx -// Created: 26.04.04 17:15:10 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // - +// File: ShHealOper_FillHoles.hxx +// Created: 26.04.04 17:15:10 +// Author: Galina KULIKOVA #ifndef ShHealOper_FillHoles_HeaderFile diff --git a/src/ShHealOper/ShHealOper_RemoveFace.cxx b/src/ShHealOper/ShHealOper_RemoveFace.cxx index 3501fe024..0bf3c17ae 100644 --- a/src/ShHealOper/ShHealOper_RemoveFace.cxx +++ b/src/ShHealOper/ShHealOper_RemoveFace.cxx @@ -1,24 +1,26 @@ -// File: ShHealOper_RemoveFace.cxx -// Created: 16.04.04 12:12:38 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_RemoveFace.cxx +// Created: 16.04.04 12:12:38 +// Author: Galina KULIKOVA #include #include diff --git a/src/ShHealOper/ShHealOper_RemoveFace.hxx b/src/ShHealOper/ShHealOper_RemoveFace.hxx index 22b2923e8..3c6aa9cd2 100644 --- a/src/ShHealOper/ShHealOper_RemoveFace.hxx +++ b/src/ShHealOper/ShHealOper_RemoveFace.hxx @@ -1,25 +1,26 @@ -// File: ShHealOper_RemoveFace.hxx -// Created: 15.04.04 18:10:16 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // - +// File: ShHealOper_RemoveFace.hxx +// Created: 15.04.04 18:10:16 +// Author: Galina KULIKOVA #ifndef ShHealOper_RemoveFace_HeaderFile diff --git a/src/ShHealOper/ShHealOper_RemoveInternalWires.cxx b/src/ShHealOper/ShHealOper_RemoveInternalWires.cxx index 9fbb71c5f..8865287f4 100644 --- a/src/ShHealOper/ShHealOper_RemoveInternalWires.cxx +++ b/src/ShHealOper/ShHealOper_RemoveInternalWires.cxx @@ -1,24 +1,26 @@ -// File: ShHealOper_RemoveInternalWires.cxx -// Created: 26.04.04 14:46:45 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_RemoveInternalWires.cxx +// Created: 26.04.04 14:46:45 +// Author: Galina KULIKOVA #include diff --git a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx index fec59375c..6cad8d361 100644 --- a/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx +++ b/src/ShHealOper/ShHealOper_RemoveInternalWires.hxx @@ -1,24 +1,26 @@ -// File: ShHealOper_RemoveInternalWires.hxx -// Created: 26.04.04 11:22:26 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_RemoveInternalWires.hxx +// Created: 26.04.04 11:22:26 +// Author: Galina KULIKOVA #ifndef ShHealOper_RemoveInternalWires_HeaderFile diff --git a/src/ShHealOper/ShHealOper_Sewing.cxx b/src/ShHealOper/ShHealOper_Sewing.cxx index 62ed52e49..be67bb569 100644 --- a/src/ShHealOper/ShHealOper_Sewing.cxx +++ b/src/ShHealOper/ShHealOper_Sewing.cxx @@ -1,24 +1,26 @@ -// File: ShHealOper_Sewing.cxx -// Created: 29.04.04 15:07:10 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_Sewing.cxx +// Created: 29.04.04 15:07:10 +// Author: Galina KULIKOVA #include diff --git a/src/ShHealOper/ShHealOper_Sewing.hxx b/src/ShHealOper/ShHealOper_Sewing.hxx index 8872e294d..c3209d246 100644 --- a/src/ShHealOper/ShHealOper_Sewing.hxx +++ b/src/ShHealOper/ShHealOper_Sewing.hxx @@ -1,24 +1,26 @@ -// File: ShHealOper_Sewing.hxx -// Created: 29.04.04 13:29:10 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_Sewing.hxx +// Created: 29.04.04 13:29:10 +// Author: Galina KULIKOVA #ifndef ShHealOper_Sewing_HeaderFile diff --git a/src/ShHealOper/ShHealOper_ShapeProcess.cxx b/src/ShHealOper/ShHealOper_ShapeProcess.cxx index 061d8811e..07c7291fe 100644 --- a/src/ShHealOper/ShHealOper_ShapeProcess.cxx +++ b/src/ShHealOper/ShHealOper_ShapeProcess.cxx @@ -1,24 +1,26 @@ -// File: ShHealOper_ShapeProcess.cxx -// Created: 14.04.04 10:58:04 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_ShapeProcess.cxx +// Created: 14.04.04 10:58:04 +// Author: Galina KULIKOVA #include #include diff --git a/src/ShHealOper/ShHealOper_ShapeProcess.hxx b/src/ShHealOper/ShHealOper_ShapeProcess.hxx index 62f2c3abb..e62fc56be 100644 --- a/src/ShHealOper/ShHealOper_ShapeProcess.hxx +++ b/src/ShHealOper/ShHealOper_ShapeProcess.hxx @@ -1,24 +1,26 @@ -// File: ShHealOper_ShapeProcess.hxx -// Created: 13.04.04 11:45:20 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_ShapeProcess.hxx +// Created: 13.04.04 11:45:20 +// Author: Galina KULIKOVA #ifndef ShHealOper_ShapeProcess_HeaderFile diff --git a/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx b/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx index e7cd704a1..d69b411b6 100644 --- a/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx +++ b/src/ShHealOper/ShHealOper_SpiltCurve2d.hxx @@ -1,24 +1,26 @@ -// File: ShHealOper_SplitCurve2d.hxx -// Created: 05.05.04 12:56:01 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_SplitCurve2d.hxx +// Created: 05.05.04 12:56:01 +// Author: Galina KULIKOVA #ifndef ShHealOper_SplitCurve2d_HeaderFile diff --git a/src/ShHealOper/ShHealOper_SplitCurve2d.cxx b/src/ShHealOper/ShHealOper_SplitCurve2d.cxx index 2cc261fa2..79e4f08f7 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve2d.cxx +++ b/src/ShHealOper/ShHealOper_SplitCurve2d.cxx @@ -1,24 +1,26 @@ -// File: ShHealOper_SplitCurve2d.cxx -// Created: 05.05.04 13:03:10 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_SplitCurve2d.cxx +// Created: 05.05.04 13:03:10 +// Author: Galina KULIKOVA #include diff --git a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx index ca1f7aa35..aa62b4a94 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve2d.hxx +++ b/src/ShHealOper/ShHealOper_SplitCurve2d.hxx @@ -1,24 +1,26 @@ -// File: ShHealOper_SplitCurve2d.hxx -// Created: 05.05.04 12:56:01 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_SplitCurve2d.hxx +// Created: 05.05.04 12:56:01 +// Author: Galina KULIKOVA #ifndef ShHealOper_SplitCurve2d_HeaderFile diff --git a/src/ShHealOper/ShHealOper_SplitCurve3d.cxx b/src/ShHealOper/ShHealOper_SplitCurve3d.cxx index 67405daea..0b4142ac7 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve3d.cxx +++ b/src/ShHealOper/ShHealOper_SplitCurve3d.cxx @@ -1,24 +1,26 @@ -// File: ShHealOper_SplitCurve3d.cxx -// Created: 05.05.04 12:48:36 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_SplitCurve3d.cxx +// Created: 05.05.04 12:48:36 +// Author: Galina KULIKOVA #include diff --git a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx index 97feb74f8..8818e6b16 100644 --- a/src/ShHealOper/ShHealOper_SplitCurve3d.hxx +++ b/src/ShHealOper/ShHealOper_SplitCurve3d.hxx @@ -1,24 +1,26 @@ -// File: ShHealOper_SplitCurve3d.hxx -// Created: 05.05.04 12:28:13 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_SplitCurve3d.hxx +// Created: 05.05.04 12:28:13 +// Author: Galina KULIKOVA #ifndef ShHealOper_SplitCurve3d_HeaderFile diff --git a/src/ShHealOper/ShHealOper_Tool.cxx b/src/ShHealOper/ShHealOper_Tool.cxx index dd3164d73..4827956ac 100644 --- a/src/ShHealOper/ShHealOper_Tool.cxx +++ b/src/ShHealOper/ShHealOper_Tool.cxx @@ -1,25 +1,26 @@ -// File: ShHealOper_Tool.cxx -// Created: 26.04.04 12:11:33 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // - +// File: ShHealOper_Tool.cxx +// Created: 26.04.04 12:11:33 +// Author: Galina KULIKOVA #include diff --git a/src/ShHealOper/ShHealOper_Tool.hxx b/src/ShHealOper/ShHealOper_Tool.hxx index 7ec0febed..587c474e1 100644 --- a/src/ShHealOper/ShHealOper_Tool.hxx +++ b/src/ShHealOper/ShHealOper_Tool.hxx @@ -1,24 +1,26 @@ -// File: ShHealOper_Tool.hxx -// Created: 26.04.04 11:36:04 -// Author: Galina KULIKOVA -// < MODULE = KERNEL> : -// Copyright (C) 2003 CEA +// Copyright (C) 2005 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. // -// 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. +// 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 // - -// 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. +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // -// 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 // +// File: ShHealOper_Tool.hxx +// Created: 26.04.04 11:36:04 +// Author: Galina KULIKOVA #ifndef ShHealOper_Tool_HeaderFile diff --git a/src/TransformationGUI/Makefile.in b/src/TransformationGUI/Makefile.in index 22de12a82..6630d8531 100644 --- a/src/TransformationGUI/Makefile.in +++ b/src/TransformationGUI/Makefile.in @@ -17,7 +17,7 @@ # 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 +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # # @@ -66,8 +66,8 @@ LIB_SERVER_IDL = # additionnal information to compil and link file -CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome -CXXFLAGS += -I${KERNEL_ROOT_DIR}/include/salome -I${GUI_ROOT_DIR}/include/salome +CPPFLAGS += $(QT_INCLUDES) $(VTK_INCLUDES) $(OCC_INCLUDES) $(PYTHON_INCLUDES) $(BOOST_CPPFLAGS) $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) +CXXFLAGS += $(KERNEL_CXXFLAGS) $(GUI_CXXFLAGS) LDFLAGS += -lGEOMFiltersSelection -lGEOMBase diff --git a/src/TransformationGUI/TransformationGUI.cxx b/src/TransformationGUI/TransformationGUI.cxx index 84c79078f..cbeccad42 100644 --- a/src/TransformationGUI/TransformationGUI.cxx +++ b/src/TransformationGUI/TransformationGUI.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -86,53 +86,35 @@ bool TransformationGUI::OnGUIEvent(int theCommandID, SUIT_Desktop* parent) QDialog* aDlg = NULL; switch (theCommandID) - { - case 5021: // TRANSLATION - { - aDlg = new TransformationGUI_TranslationDlg( getGeometryGUI(), parent, "" ); - break; - } - case 5022: // ROTATION - { - aDlg = new TransformationGUI_RotationDlg( parent, "" ); - break; - } - case 5023: // POSITION - { - aDlg = new TransformationGUI_PositionDlg( parent, "" ); - break; - } - case 5024: // MIRROR - { - aDlg = new TransformationGUI_MirrorDlg( parent, "" ); - break; - } - case 5025: // SCALE - { - aDlg = new TransformationGUI_ScaleDlg( getGeometryGUI(), parent, "" ); - break; - } - case 5026: // OFFSET - { - aDlg = new TransformationGUI_OffsetDlg( parent, "" ); - break; - } - case 5027: // MULTI TRANSLATION - { - aDlg = new TransformationGUI_MultiTranslationDlg( getGeometryGUI(), parent, "" ); - break; - } - case 5028: // MULTI ROTATION - { - aDlg = new TransformationGUI_MultiRotationDlg( getGeometryGUI(), parent, "" ); - break; - } - default: - { - SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); - break; - } - } + { + case 5021: // TRANSLATION + aDlg = new TransformationGUI_TranslationDlg( getGeometryGUI(), parent, "" ); + break; + case 5022: // ROTATION + aDlg = new TransformationGUI_RotationDlg( getGeometryGUI(), parent, "" ); + break; + case 5023: // POSITION + aDlg = new TransformationGUI_PositionDlg( getGeometryGUI(), parent, "" ); + break; + case 5024: // MIRROR + aDlg = new TransformationGUI_MirrorDlg( getGeometryGUI(), parent, "" ); + break; + case 5025: // SCALE + aDlg = new TransformationGUI_ScaleDlg( getGeometryGUI(), parent, "" ); + break; + case 5026: // OFFSET + aDlg = new TransformationGUI_OffsetDlg( getGeometryGUI(), parent, "" ); + break; + case 5027: // MULTI TRANSLATION + aDlg = new TransformationGUI_MultiTranslationDlg( getGeometryGUI(), parent, "" ); + break; + case 5028: // MULTI ROTATION + aDlg = new TransformationGUI_MultiRotationDlg( getGeometryGUI(), parent, "" ); + break; + default: + SUIT_Session::session()->activeApplication()->putInfo(tr("GEOM_PRP_COMMAND").arg(theCommandID)); + break; + } if ( aDlg != NULL ) aDlg->show(); diff --git a/src/TransformationGUI/TransformationGUI.h b/src/TransformationGUI/TransformationGUI.h index 96f48970b..77ef5de5f 100644 --- a/src/TransformationGUI/TransformationGUI.h +++ b/src/TransformationGUI/TransformationGUI.h @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx index 8f09b83f8..5e6868836 100644 --- a/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -49,8 +49,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -TransformationGUI_MirrorDlg::TransformationGUI_MirrorDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +TransformationGUI_MirrorDlg::TransformationGUI_MirrorDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_MIRROR_POINT"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_MIRROR_AXE"))); @@ -77,8 +79,9 @@ TransformationGUI_MirrorDlg::TransformationGUI_MirrorDlg(QWidget* parent, const GroupPoints->PushButton2->setPixmap(image3); GroupPoints->CheckButton1->setText(tr("GEOM_CREATE_COPY")); Layout1->addWidget(GroupPoints, 2, 0); - /***************************************************************/ + + setHelpFileName("mirror_image.htm"); Init(); } @@ -124,7 +127,7 @@ void TransformationGUI_MirrorDlg::Init() connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool))); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); initName( tr( "GEOM_MIRROR" ) ); @@ -132,14 +135,13 @@ void TransformationGUI_MirrorDlg::Init() } - //================================================================================= // function : ConstructorsClicked() // purpose : Radio button management //================================================================================= void TransformationGUI_MirrorDlg::ConstructorsClicked(int constructorId) { - disconnect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0 ); + disconnect( myGeomGUI->getApp()->selectionMgr(), 0, this, 0 ); globalSelection(); myEditCurrentArgument = GroupPoints->LineEdit1; @@ -164,7 +166,7 @@ void TransformationGUI_MirrorDlg::ConstructorsClicked(int constructorId) break; } } - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); } @@ -196,16 +198,6 @@ bool TransformationGUI_MirrorDlg::ClickOnApply() } -//======================================================================= -// function : ClickOnCancel() -// purpose : -//======================================================================= -void TransformationGUI_MirrorDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection has changed @@ -310,22 +302,12 @@ void TransformationGUI_MirrorDlg::SetEditCurrentArgument() void TransformationGUI_MirrorDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); ConstructorsClicked( getConstructorId() ); } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void TransformationGUI_MirrorDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : enterEvent() // purpose : when mouse enter onto the QWidget diff --git a/src/TransformationGUI/TransformationGUI_MirrorDlg.h b/src/TransformationGUI/TransformationGUI_MirrorDlg.h index 150d3edae..44d8f5dda 100644 --- a/src/TransformationGUI/TransformationGUI_MirrorDlg.h +++ b/src/TransformationGUI/TransformationGUI_MirrorDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : TransformationGUI_MirrorDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_MIRROR_H #define DIALOGBOX_MIRROR_H @@ -44,7 +43,8 @@ class TransformationGUI_MirrorDlg : public GEOMBase_Skeleton Q_OBJECT public: - TransformationGUI_MirrorDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TransformationGUI_MirrorDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~TransformationGUI_MirrorDlg(); protected: @@ -55,7 +55,7 @@ protected: virtual void closeEvent( QCloseEvent* e ); -private : +private: void Init(); void enterEvent(QEvent* e); @@ -67,9 +67,7 @@ private : private slots : void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx index 88b262a44..01c8b24a0 100644 --- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -49,12 +49,15 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -TransformationGUI_MultiRotationDlg::TransformationGUI_MultiRotationDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +TransformationGUI_MultiRotationDlg::TransformationGUI_MultiRotationDlg + (GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_MULTIROTATION_SIMPLE"))); - QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_MULTIROTATION_DOUBLE"))); - QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); + SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr(); + QPixmap image0(aResMgr->loadPixmap("GEOM",tr("ICON_DLG_MULTIROTATION_SIMPLE"))); + QPixmap image1(aResMgr->loadPixmap("GEOM",tr("ICON_DLG_MULTIROTATION_DOUBLE"))); + QPixmap image2(aResMgr->loadPixmap("GEOM",tr("ICON_SELECT"))); setCaption(tr("GEOM_MULTIROTATION_TITLE")); @@ -92,6 +95,8 @@ TransformationGUI_MultiRotationDlg::TransformationGUI_MultiRotationDlg(GeometryG Layout1->addWidget(GroupDimensions, 2, 0); /***************************************************************/ + setHelpFileName("multi_rotation.htm"); + Init(); } @@ -152,15 +157,15 @@ void TransformationGUI_MultiRotationDlg::Init() connect(GroupDimensions->SpinBox_DX2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DY2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX1, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY1, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX2, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY2, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX1, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY1, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX2, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY2, SLOT(SetStep(double))); connect(GroupDimensions->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(ReverseAngle())); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); initName( tr( "GEOM_MULTIROTATION" ) ); @@ -174,12 +179,12 @@ void TransformationGUI_MultiRotationDlg::Init() //================================================================================= void TransformationGUI_MultiRotationDlg::ConstructorsClicked(int constructorId) { - disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0); - + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); + myAng = 45.0; myStep = 50.0; myNbTimes1 = myNbTimes2 = 2; - + globalSelection( GEOM_ALLSHAPES ); switch (constructorId) @@ -219,7 +224,8 @@ void TransformationGUI_MultiRotationDlg::ConstructorsClicked(int constructorId) myEditCurrentArgument->setFocus(); myBase = myVector = GEOM::GEOM_Object::_nil(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), + this, SLOT(SelectionIntoArgument())); } @@ -249,16 +255,6 @@ bool TransformationGUI_MultiRotationDlg::ClickOnApply() } -//======================================================================= -// function : ClickOnCancel() -// purpose : -//======================================================================= -void TransformationGUI_MultiRotationDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed or other case @@ -266,28 +262,32 @@ void TransformationGUI_MultiRotationDlg::ClickOnCancel() void TransformationGUI_MultiRotationDlg::SelectionIntoArgument() { myEditCurrentArgument->setText(""); - - if(IObjectCount() != 1) { - if(myEditCurrentArgument == GroupPoints->LineEdit1 || myEditCurrentArgument == GroupDimensions->LineEdit1) + + if (IObjectCount() != 1) { + if (myEditCurrentArgument == GroupPoints->LineEdit1 || + myEditCurrentArgument == GroupDimensions->LineEdit1) myBase = GEOM::GEOM_Object::_nil(); - else if(myEditCurrentArgument == GroupPoints->LineEdit2 || myEditCurrentArgument == GroupDimensions->LineEdit2) + else if (myEditCurrentArgument == GroupPoints->LineEdit2 || + myEditCurrentArgument == GroupDimensions->LineEdit2) myVector = GEOM::GEOM_Object::_nil(); return; } - + // nbSel == 1 Standard_Boolean testResult = Standard_False;; - GEOM::GEOM_Object_var aSelectedObject = GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult ); + GEOM::GEOM_Object_var aSelectedObject = + GEOMBase::ConvertIOinGEOMObject(firstIObject(), testResult ); - if ( !testResult || CORBA::is_nil( aSelectedObject ) || !GEOMBase::IsShape( aSelectedObject ) ) + if (!testResult || CORBA::is_nil(aSelectedObject) || !GEOMBase::IsShape(aSelectedObject)) return; - - if(myEditCurrentArgument == GroupPoints->LineEdit1 || myEditCurrentArgument == GroupDimensions->LineEdit1) + if (myEditCurrentArgument == GroupPoints->LineEdit1 || + myEditCurrentArgument == GroupDimensions->LineEdit1) myBase = aSelectedObject; - else if(myEditCurrentArgument == GroupPoints->LineEdit2 || myEditCurrentArgument == GroupDimensions->LineEdit2) + else if (myEditCurrentArgument == GroupPoints->LineEdit2 || + myEditCurrentArgument == GroupDimensions->LineEdit2) myVector = aSelectedObject; - + myEditCurrentArgument->setText( GEOMBase::GetName( aSelectedObject ) ); displayPreview(); @@ -347,23 +347,13 @@ void TransformationGUI_MultiRotationDlg::LineEditReturnPressed() void TransformationGUI_MultiRotationDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); ConstructorsClicked( getConstructorId() ); } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void TransformationGUI_MultiRotationDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : enterEvent() // purpose : @@ -421,7 +411,7 @@ void TransformationGUI_MultiRotationDlg::ReverseAngle() //================================================================================= GEOM::GEOM_IOperations_ptr TransformationGUI_MultiRotationDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetITransformOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetITransformOperations( getStudyId() ); } @@ -449,7 +439,8 @@ bool TransformationGUI_MultiRotationDlg::execute( ObjectList& objects ) case 0 : { if ( !CORBA::is_nil( myBase ) && !CORBA::is_nil( myVector ) ) { - anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MultiRotate1D( myBase, myVector, myNbTimes1 ); + anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )-> + MultiRotate1D( myBase, myVector, myNbTimes1 ); res = true; } break; @@ -458,7 +449,8 @@ bool TransformationGUI_MultiRotationDlg::execute( ObjectList& objects ) { if ( !CORBA::is_nil( myBase ) && !CORBA::is_nil( myVector ) ) { - anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )->MultiRotate2D( myBase, myVector, myAng, myNbTimes1, myStep, myNbTimes2 ); + anObj = GEOM::GEOM_ITransformOperations::_narrow( getOperation() )-> + MultiRotate2D( myBase, myVector, myAng, myNbTimes1, myStep, myNbTimes2 ); res = true; } break; diff --git a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h index c122bc3eb..d82780fd2 100644 --- a/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h +++ b/src/TransformationGUI/TransformationGUI_MultiRotationDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : TransformationGUI_MultiRotationDlg.h // Author : Damien COQUERET // Module : GEOM -// $Header$ #ifndef DIALOGBOX_MULTIROTATION_H #define DIALOGBOX_MULTIROTATION_H @@ -43,7 +42,8 @@ class TransformationGUI_MultiRotationDlg : public GEOMBase_Skeleton Q_OBJECT public: - TransformationGUI_MultiRotationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TransformationGUI_MultiRotationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~TransformationGUI_MultiRotationDlg(); protected: @@ -58,8 +58,6 @@ private : void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myBase, myVector; int myNbTimes1; int myNbTimes2; @@ -72,16 +70,13 @@ private : private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); void ReverseAngle(); void ValueChangedInSpinBox(double newValue); void ConstructorsClicked(int constructorId); - }; #endif // DIALOGBOX_MULTIROTATION_H diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx index 255df8858..c1e7aed86 100644 --- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -50,12 +50,15 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -TransformationGUI_MultiTranslationDlg::TransformationGUI_MultiTranslationDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +TransformationGUI_MultiTranslationDlg::TransformationGUI_MultiTranslationDlg + (GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_DLG_MULTITRANSLATION_SIMPLE"))); - QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_DLG_MULTITRANSLATION_DOUBLE"))); - QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap( "GEOM",tr("ICON_SELECT"))); + SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr(); + QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_MULTITRANSLATION_SIMPLE"))); + QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_MULTITRANSLATION_DOUBLE"))); + QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT"))); setCaption(tr("GEOM_MULTITRANSLATION_TITLE")); @@ -99,6 +102,8 @@ TransformationGUI_MultiTranslationDlg::TransformationGUI_MultiTranslationDlg(Geo Layout1->addWidget(GroupDimensions, 2, 0); /***************************************************************/ + setHelpFileName("multi_translation.htm"); + Init(); } @@ -163,18 +168,18 @@ void TransformationGUI_MultiTranslationDlg::Init() connect(GroupDimensions->SpinBox_DX2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); connect(GroupDimensions->SpinBox_DY2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX1, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY1, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX2, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY2, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DY, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX1, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY1, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DX2, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupDimensions->SpinBox_DY2, SLOT(SetStep(double))); connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(ReverseStepU())); connect(GroupDimensions->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(ReverseStepU())); connect(GroupDimensions->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(ReverseStepV())); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); @@ -189,7 +194,7 @@ void TransformationGUI_MultiTranslationDlg::Init() //================================================================================= void TransformationGUI_MultiTranslationDlg::ConstructorsClicked(int constructorId) { - disconnect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0); + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myStepU = myStepV = 50.0; myNbTimesU = myNbTimesV = 2; @@ -236,7 +241,7 @@ void TransformationGUI_MultiTranslationDlg::ConstructorsClicked(int constructorI myEditCurrentArgument->setFocus(); myBase = myVectorU = GEOM::GEOM_Object::_nil(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); } @@ -267,16 +272,6 @@ bool TransformationGUI_MultiTranslationDlg::ClickOnApply() } -//======================================================================= -// function : ClickOnCancel() -// purpose : -//======================================================================= -void TransformationGUI_MultiTranslationDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed or other case @@ -374,23 +369,13 @@ void TransformationGUI_MultiTranslationDlg::LineEditReturnPressed() void TransformationGUI_MultiTranslationDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); ConstructorsClicked( getConstructorId() ); } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void TransformationGUI_MultiTranslationDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : enterEvent() // purpose : @@ -477,7 +462,7 @@ void TransformationGUI_MultiTranslationDlg::ReverseStepV() //================================================================================= GEOM::GEOM_IOperations_ptr TransformationGUI_MultiTranslationDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetITransformOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetITransformOperations( getStudyId() ); } diff --git a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h index 8fd449628..c36073d8b 100644 --- a/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h +++ b/src/TransformationGUI/TransformationGUI_MultiTranslationDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : TransformationGUI_MultiTranslationDlg.h // Author : Damien COQUERET // Module : GEOM -// $Header$ #ifndef DIALOGBOX_MULTITRANSLATION_H #define DIALOGBOX_MULTITRANSLATION_H @@ -43,7 +42,8 @@ class TransformationGUI_MultiTranslationDlg : public GEOMBase_Skeleton Q_OBJECT public: - TransformationGUI_MultiTranslationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TransformationGUI_MultiTranslationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~TransformationGUI_MultiTranslationDlg(); protected: @@ -58,8 +58,6 @@ private : void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myBase, myVectorU, myVectorV ; int myNbTimesU; int myNbTimesV; @@ -72,9 +70,7 @@ private : private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); @@ -82,7 +78,6 @@ private slots: void ReverseStepV(); void ValueChangedInSpinBox(double newValue); void ConstructorsClicked(int constructorId); - }; #endif // DIALOGBOX_MULTITRANSLATION_H diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx index 805bc8a72..6fe4f3bc4 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -47,8 +47,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -TransformationGUI_OffsetDlg::TransformationGUI_OffsetDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +TransformationGUI_OffsetDlg::TransformationGUI_OffsetDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_OFFSET"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -75,6 +77,8 @@ TransformationGUI_OffsetDlg::TransformationGUI_OffsetDlg(QWidget* parent, const Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + + setHelpFileName("offset_surface.htm"); Init(); } @@ -118,7 +122,7 @@ void TransformationGUI_OffsetDlg::Init() connect(buttonApply, SIGNAL(clicked()), this, SLOT(ClickOnApply())); connect(GroupPoints->PushButton1, SIGNAL(clicked()), this, SLOT(SetEditCurrentArgument())); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); @@ -156,16 +160,6 @@ bool TransformationGUI_OffsetDlg::ClickOnApply() } -//======================================================================= -// function : ClickOnCancel() -// purpose : -//======================================================================= -void TransformationGUI_OffsetDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection has changed @@ -243,7 +237,7 @@ void TransformationGUI_OffsetDlg::enterEvent(QEvent * e) void TransformationGUI_OffsetDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); globalSelection( GEOM_ALLSHAPES ); myEditCurrentArgument = GroupPoints->LineEdit1; @@ -251,16 +245,6 @@ void TransformationGUI_OffsetDlg::ActivateThisDialog() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void TransformationGUI_OffsetDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : ValueChangedInSpinBox() // purpose : diff --git a/src/TransformationGUI/TransformationGUI_OffsetDlg.h b/src/TransformationGUI/TransformationGUI_OffsetDlg.h index da127fbc0..a49cdd87f 100644 --- a/src/TransformationGUI/TransformationGUI_OffsetDlg.h +++ b/src/TransformationGUI/TransformationGUI_OffsetDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : TransformationGUI_OffsetDlg.h // Author : Michael Zorin // Module : GEOM -// $Header: /dn05/salome/PAL/GEOM/GEOM_SRC/src/TransformationGUI/TransformationGUI_Offset.h #ifndef DIALOGBOX_OFFSET_H #define DIALOGBOX_OFFSET_H @@ -42,7 +41,8 @@ class TransformationGUI_OffsetDlg : public GEOMBase_Skeleton Q_OBJECT public: - TransformationGUI_OffsetDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TransformationGUI_OffsetDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~TransformationGUI_OffsetDlg(); protected: @@ -53,7 +53,7 @@ protected: virtual void closeEvent( QCloseEvent* e ); -private : +private: void Init(); void enterEvent(QEvent* e); double GetOffset() const; @@ -62,12 +62,10 @@ private : DlgRef_1Sel1Spin1Check* GroupPoints; -private slots : +private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void SelectionIntoArgument(); void LineEditReturnPressed(); void SetEditCurrentArgument(); @@ -76,4 +74,3 @@ private slots : }; #endif // DIALOGBOX_OFFSET_H - diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx index e16e3bbd3..07c3dee7c 100644 --- a/src/TransformationGUI/TransformationGUI_PositionDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_PositionDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -51,12 +51,15 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -TransformationGUI_PositionDlg::TransformationGUI_PositionDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +TransformationGUI_PositionDlg::TransformationGUI_PositionDlg + (GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) + : GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POSITION"))); - QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_POSITION2"))); - QPixmap imageselect(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); + SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr(); + QPixmap image0(aResMgr->loadPixmap("GEOM",tr("ICON_DLG_POSITION"))); + QPixmap image1(aResMgr->loadPixmap("GEOM",tr("ICON_DLG_POSITION2"))); + QPixmap imageselect(aResMgr->loadPixmap("GEOM",tr("ICON_SELECT"))); setCaption(tr("GEOM_POSITION_TITLE")); @@ -85,6 +88,8 @@ TransformationGUI_PositionDlg::TransformationGUI_PositionDlg(QWidget* parent, c Layout1->addWidget(Group1, 2, 0); /***************************************************************/ + + setHelpFileName("modify_the_location.htm"); Init(); } @@ -133,7 +138,7 @@ void TransformationGUI_PositionDlg::Init() connect(Group1->CheckBox1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool))); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); initName( tr( "GEOM_POSITION" ) ); @@ -148,7 +153,7 @@ void TransformationGUI_PositionDlg::Init() //================================================================================= void TransformationGUI_PositionDlg::ConstructorsClicked(int constructorId) { - disconnect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0 ); + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); globalSelection(); myEditCurrentArgument = Group1->LineEdit1; @@ -174,13 +179,12 @@ void TransformationGUI_PositionDlg::ConstructorsClicked(int constructorId) break; } } - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); SelectionIntoArgument(); } - //================================================================================= // function : ClickOnOk() // purpose : @@ -207,16 +211,6 @@ bool TransformationGUI_PositionDlg::ClickOnApply() } -//======================================================================= -// function : ClickOnCancel() -// purpose : -//======================================================================= -void TransformationGUI_PositionDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection has changed @@ -328,22 +322,12 @@ void TransformationGUI_PositionDlg::SetEditCurrentArgument() void TransformationGUI_PositionDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); ConstructorsClicked( getConstructorId() ); } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void TransformationGUI_PositionDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : enterEvent() // purpose : when mouse enter onto the QWidget diff --git a/src/TransformationGUI/TransformationGUI_PositionDlg.h b/src/TransformationGUI/TransformationGUI_PositionDlg.h index 2e5e499b4..9ecfb2809 100644 --- a/src/TransformationGUI/TransformationGUI_PositionDlg.h +++ b/src/TransformationGUI/TransformationGUI_PositionDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : TransformationGUI_PositionDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_POSITION_H #define DIALOGBOX_POSITION_H @@ -44,7 +43,8 @@ class TransformationGUI_PositionDlg : public GEOMBase_Skeleton Q_OBJECT public: - TransformationGUI_PositionDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TransformationGUI_PositionDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~TransformationGUI_PositionDlg(); protected: @@ -55,7 +55,7 @@ protected: virtual void closeEvent( QCloseEvent* e ); -private : +private: void Init(); void enterEvent(QEvent* e); @@ -65,12 +65,10 @@ private : DlgRef_3Sel3Spin1Check* Group1; -private slots : +private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx index 7b1abd28b..6f07b1c73 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -49,8 +49,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -TransformationGUI_RotationDlg::TransformationGUI_RotationDlg(QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) +TransformationGUI_RotationDlg::TransformationGUI_RotationDlg + (GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_ROTATION"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -101,9 +103,11 @@ TransformationGUI_RotationDlg::TransformationGUI_RotationDlg(QWidget* parent, c connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool))); connect(GroupPoints->CheckButton2, SIGNAL(toggled(bool)), this, SLOT(onReverse())); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; + setHelpFileName("rotation.htm"); + Init(); } @@ -159,16 +163,6 @@ bool TransformationGUI_RotationDlg::ClickOnApply() } -//======================================================================= -// function : ClickOnCancel() -// purpose : -//======================================================================= -void TransformationGUI_RotationDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed or other case @@ -254,7 +248,7 @@ void TransformationGUI_RotationDlg::LineEditReturnPressed() void TransformationGUI_RotationDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); globalSelection(); GroupPoints->LineEdit1->setFocus(); @@ -264,16 +258,6 @@ void TransformationGUI_RotationDlg::ActivateThisDialog() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void TransformationGUI_RotationDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : enterEvent() // purpose : diff --git a/src/TransformationGUI/TransformationGUI_RotationDlg.h b/src/TransformationGUI/TransformationGUI_RotationDlg.h index 173ce35de..482444450 100644 --- a/src/TransformationGUI/TransformationGUI_RotationDlg.h +++ b/src/TransformationGUI/TransformationGUI_RotationDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : TransformationGUI_RotationDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_ROTATION_H #define DIALOGBOX_ROTATION_H @@ -41,7 +40,8 @@ class TransformationGUI_RotationDlg : public GEOMBase_Skeleton Q_OBJECT public: - TransformationGUI_RotationDlg(QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TransformationGUI_RotationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~TransformationGUI_RotationDlg(); protected: @@ -52,7 +52,7 @@ protected: virtual void closeEvent( QCloseEvent* e ); -private : +private: void Init(); void enterEvent(QEvent* e); double GetAngle() const; @@ -65,9 +65,7 @@ private : private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx index a215ba028..259a1da2d 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -49,8 +49,10 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -TransformationGUI_ScaleDlg::TransformationGUI_ScaleDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +TransformationGUI_ScaleDlg::TransformationGUI_ScaleDlg(GeometryGUI* theGeometryGUI, QWidget* parent, + const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_SCALE"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); @@ -101,12 +103,14 @@ TransformationGUI_ScaleDlg::TransformationGUI_ScaleDlg(GeometryGUI* theGeometryG connect(GroupPoints->LineEdit2, SIGNAL(returnPressed()), this, SLOT(LineEditReturnPressed())); connect(GroupPoints->SpinBox_DX, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox_DX, SLOT(SetStep(double))); connect(GroupPoints->CheckButton1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool))); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; + setHelpFileName("scale_transform.htm"); + Init(); } @@ -161,16 +165,6 @@ bool TransformationGUI_ScaleDlg::ClickOnApply() } -//======================================================================= -// function : ClickOnCancel() -// purpose : -//======================================================================= -void TransformationGUI_ScaleDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed or other case @@ -256,7 +250,7 @@ void TransformationGUI_ScaleDlg::SetEditCurrentArgument() void TransformationGUI_ScaleDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); globalSelection(); GroupPoints->LineEdit1->setFocus(); @@ -264,16 +258,6 @@ void TransformationGUI_ScaleDlg::ActivateThisDialog() } -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void TransformationGUI_ScaleDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); -} - - //================================================================================= // function : enterEvent() // purpose : @@ -301,7 +285,7 @@ void TransformationGUI_ScaleDlg::ValueChangedInSpinBox() //================================================================================= GEOM::GEOM_IOperations_ptr TransformationGUI_ScaleDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetITransformOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetITransformOperations( getStudyId() ); } //================================================================================= diff --git a/src/TransformationGUI/TransformationGUI_ScaleDlg.h b/src/TransformationGUI/TransformationGUI_ScaleDlg.h index 8f0e61c07..0190f04d5 100644 --- a/src/TransformationGUI/TransformationGUI_ScaleDlg.h +++ b/src/TransformationGUI/TransformationGUI_ScaleDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : TransformationGUI_ScaleDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_SCALE_H #define DIALOGBOX_SCALE_H @@ -42,7 +41,8 @@ class TransformationGUI_ScaleDlg : public GEOMBase_Skeleton Q_OBJECT public: - TransformationGUI_ScaleDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TransformationGUI_ScaleDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~TransformationGUI_ScaleDlg(); protected: @@ -58,19 +58,15 @@ private : void enterEvent(QEvent* e); double GetFactor() const; - GeometryGUI* myGeometryGUI; - GEOM::ListOfGO myObjects; GEOM::GEOM_Object_var myPoint; /* Central Point */ DlgRef_2Sel1Spin2Check* GroupPoints; -private slots : +private slots: void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx index d221fb855..0a02a62a6 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.cxx @@ -17,7 +17,7 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // @@ -49,13 +49,16 @@ using namespace std; // The dialog will by default be modeless, unless you set 'modal' to // TRUE to construct a modal dialog. //================================================================================= -TransformationGUI_TranslationDlg::TransformationGUI_TranslationDlg(GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) - :GEOMBase_Skeleton(parent, name, modal, WStyle_Customize | WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu), myGeometryGUI(theGeometryGUI) +TransformationGUI_TranslationDlg::TransformationGUI_TranslationDlg + (GeometryGUI* theGeometryGUI, QWidget* parent, const char* name, bool modal, WFlags fl) + :GEOMBase_Skeleton(theGeometryGUI, parent, name, modal, WStyle_Customize | + WStyle_NormalBorder | WStyle_Title | WStyle_SysMenu) { - QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_TRANSLATION_DXYZ"))); - QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_TRANSLATION_POINTS"))); - QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_TRANSLATION_VECTOR"))); - QPixmap image3(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); + SUIT_ResourceMgr* aResMgr = myGeomGUI->getApp()->resourceMgr(); + QPixmap image0 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TRANSLATION_DXYZ"))); + QPixmap image1 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TRANSLATION_POINTS"))); + QPixmap image2 (aResMgr->loadPixmap("GEOM", tr("ICON_DLG_TRANSLATION_VECTOR"))); + QPixmap image3 (aResMgr->loadPixmap("GEOM", tr("ICON_SELECT"))); setCaption(tr("GEOM_TRANSLATION_TITLE")); @@ -82,6 +85,8 @@ TransformationGUI_TranslationDlg::TransformationGUI_TranslationDlg(GeometryGUI* Layout1->addWidget(GroupPoints, 2, 0); /***************************************************************/ + setHelpFileName("translation.htm"); + Init(); } @@ -142,13 +147,13 @@ void TransformationGUI_TranslationDlg::Init() connect(GroupPoints->SpinBox2, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); connect(GroupPoints->SpinBox3, SIGNAL(valueChanged(double)), this, SLOT(ValueChangedInSpinBox())); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox1, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox2, SLOT(SetStep(double))); - connect(myGeometryGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox3, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox1, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox2, SLOT(SetStep(double))); + connect(myGeomGUI, SIGNAL(SignalDefaultStepValueChanged(double)), GroupPoints->SpinBox3, SLOT(SetStep(double))); connect(GroupPoints->CheckBox1, SIGNAL(toggled(bool)), this, SLOT(CreateCopyModeChanged(bool))); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())) ; initName( tr( "GEOM_TRANSLATION" ) ); @@ -162,7 +167,7 @@ void TransformationGUI_TranslationDlg::Init() //================================================================================= void TransformationGUI_TranslationDlg::ConstructorsClicked(int constructorId) { - disconnect( ((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), 0, this, 0 ); + disconnect(myGeomGUI->getApp()->selectionMgr(), 0, this, 0); myEditCurrentArgument = GroupPoints->LineEdit1; globalSelection(); @@ -200,7 +205,7 @@ void TransformationGUI_TranslationDlg::ConstructorsClicked(int constructorId) } myEditCurrentArgument->setFocus(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); } @@ -231,16 +236,6 @@ bool TransformationGUI_TranslationDlg::ClickOnApply() } -//======================================================================= -// function : ClickOnCancel() -// purpose : -//======================================================================= -void TransformationGUI_TranslationDlg::ClickOnCancel() -{ - GEOMBase_Skeleton::ClickOnCancel(); -} - - //================================================================================= // function : SelectionIntoArgument() // purpose : Called when selection as changed or other case @@ -349,20 +344,10 @@ void TransformationGUI_TranslationDlg::SetEditCurrentArgument() void TransformationGUI_TranslationDlg::ActivateThisDialog() { GEOMBase_Skeleton::ActivateThisDialog(); - connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), + connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - - ConstructorsClicked( getConstructorId() ); -} - -//================================================================================= -// function : DeactivateActiveDialog() -// purpose : public slot to deactivate if active -//================================================================================= -void TransformationGUI_TranslationDlg::DeactivateActiveDialog() -{ - GEOMBase_Skeleton::DeactivateActiveDialog(); + ConstructorsClicked( getConstructorId() ); } @@ -393,7 +378,7 @@ void TransformationGUI_TranslationDlg::ValueChangedInSpinBox() //================================================================================= GEOM::GEOM_IOperations_ptr TransformationGUI_TranslationDlg::createOperation() { - return myGeometryGUI->GetGeomGen()->GetITransformOperations( getStudyId() ); + return myGeomGUI->GetGeomGen()->GetITransformOperations( getStudyId() ); } diff --git a/src/TransformationGUI/TransformationGUI_TranslationDlg.h b/src/TransformationGUI/TransformationGUI_TranslationDlg.h index 069c33435..338c3ab15 100644 --- a/src/TransformationGUI/TransformationGUI_TranslationDlg.h +++ b/src/TransformationGUI/TransformationGUI_TranslationDlg.h @@ -17,14 +17,13 @@ // 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 +// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // // // // File : TransformationGUI_TranslationDlg.h // Author : Lucien PIGNOLONI // Module : GEOM -// $Header$ #ifndef DIALOGBOX_TRANSLATION_H #define DIALOGBOX_TRANSLATION_H @@ -42,7 +41,8 @@ class TransformationGUI_TranslationDlg : public GEOMBase_Skeleton Q_OBJECT public: - TransformationGUI_TranslationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); + TransformationGUI_TranslationDlg(GeometryGUI* theGeometryGUI, QWidget* parent = 0, + const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~TransformationGUI_TranslationDlg(); protected: @@ -57,8 +57,6 @@ private : void Init(); void enterEvent(QEvent* e); - GeometryGUI* myGeometryGUI; - GEOM::GEOM_Object_var myVector, myPoint1, myPoint2; GEOM::ListOfGO myObjects; @@ -67,9 +65,7 @@ private : private slots : void ClickOnOk(); bool ClickOnApply(); - void ClickOnCancel(); void ActivateThisDialog(); - void DeactivateActiveDialog(); void LineEditReturnPressed(); void SelectionIntoArgument(); void SetEditCurrentArgument(); -- 2.39.2

Creating basic geometrical objects